d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't include isa.c! How did it link?

Browse Source 
Otherwise clean up the includes.  Don't include anything included by
param.h.  Do include systm.h and cons.h to avoid satisfy -Wimplicit.
Don't include console.h or use NOKEY because these are for syscons
and we use generic consoles.

Don't follow null pointer for command "ls -lrt" - don't allow extra
args but do allow trailing blanks.

Check for invalid device numbers.  strtol() failures are now checked
for in all cases, but not carefully enough.  We should check for
trailing junk, allow any base in all cases (just like config) and
handle signs better . (Use strtoul not strtol and cast by assignment
to the correct type - always an integral type, PARM_ADDR is bogus.
Hex numbers > 0x7fffffff can't be entered now.  0xffffffff has to
be entered as -1.)
This commit is contained in:
bde 1994-10-30 20:44:20 +00:00
parent a783d885ad
commit 914c0040f7
1 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
sys/i386/i386/userconfig.c
View File

@ -38,16 +38,15 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
* $Id: userconfig.c,v 1.2 1994/10/28 02:37:57 jkh Exp $
* $Id: userconfig.c,v 1.3 1994/10/28 18:50:36 davidg Exp $
*/
#include <sys/param.h>
#include <sys/types.h>
#include <sys/cdefs.h>
#include <sys/systm.h>
#include <i386/i386/cons.h>
#include <i386/isa/isa_device.h>
#include <i386/isa/isa.c>
#include <machine/console.h>
#include <machine/limits.h>
#define PARM_DEVSPEC 0x1
#define PARM_INT 0x2
@ -169,15 +168,19 @@ parse_cmd(char *cmd)
static int
parse_args(char *cmd, CmdParm *parms)
{
while (*cmd) {
while (1) {
char *ptr;
if (parms->type == -1)
return 0;
if (*cmd == ' ' || *cmd == '\t') {
++cmd;
continue;
}
if (parms == NULL || parms->type == -1) {
if (*cmd == '\0')
return 0;
printf("Extra arg(s): %s\n", cmd);
return 1;
}
if (parms->type == PARM_DEVSPEC) {
int i = 0;
char devname[64];
@ -189,6 +192,12 @@ parse_args(char *cmd, CmdParm *parms)
devname[i] = NULL;
if (*cmd >= '0' && *cmd <= '9') {
unit = strtol(cmd, &ptr, 10);
if (cmd == ptr) {
printf("Invalid device number\n");
/* XXX should print invalid token here and elsewhere. */
return 1;
}
/* XXX else should require end of token. */
cmd = ptr;
}
if ((parms->parm.dparm = find_device(devname, unit)) == NULL) {
@ -345,8 +354,6 @@ cngets(char *input, int maxin)
while (1) {
c = cngetc();
if (c == NOKEY)
continue;
/* Treat ^H or ^? as backspace */
if ((c == '\010' || c == '\177')) {
if (nchars) {
@ -471,4 +478,3 @@ strtol(const char *nptr, char **endptr, int base)
*endptr = (char *)(any ? s - 1 : nptr);
return (acc);
}