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

What the heck was I thinking? Nobody else saw this? Sheesh.

Browse Source 
(num > MAX) ? MAX : num

rather than

(MAX > num) ? MAX : num

Also, make things a little easier to read while I'm here.
This commit is contained in:
mdodd 1999-08-20 01:24:35 +00:00
parent b7c3c4e3c5
commit 1bdbdefa3d
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
usr.sbin/cdcontrol/cdcontrol.c
View File

@ -20,7 +20,7 @@
#ifndef lint
static const char rcsid[] =
"$Id: cdcontrol.c,v 1.19 1999/08/19 03:29:11 mdodd Exp $";
"$Id: cdcontrol.c,v 1.20 1999/08/19 04:10:31 mdodd Exp $";
#endif /* not lint */
#include <ctype.h>
@ -937,6 +937,7 @@ input (int *cmd)
static History *hist = NULL;
static char buf[MAXLINE];
int num = 0;
int len;
const char *bp = NULL;
char *p;
@ -955,8 +956,9 @@ input (int *cmd)
if ((bp = el_gets(el, &num)) == NULL || num == 0)
return (0);
memcpy(buf, bp, (MAXLINE > num ? MAXLINE : num));
buf[num] = 0;
len = (num > MAXLINE) ? MAXLINE : num;
memcpy(buf, bp, len);
buf[len] = 0;
history(hist, H_ENTER, bp);
#undef MAXLINE

8
usr.sbin/lpr/lpc/lpc.c
View File

@ -43,7 +43,7 @@ static const char copyright[] =
static char sccsid[] = "@(#)lpc.c 8.3 (Berkeley) 4/28/95";
#endif
static const char rcsid[] =
"$Id: lpc.c,v 1.9 1999/08/19 03:29:13 mdodd Exp $";
"$Id: lpc.c,v 1.10 1999/08/19 04:10:32 mdodd Exp $";
#endif /* not lint */
#include <sys/param.h>
@ -153,6 +153,7 @@ cmdscanner()
static EditLine *el = NULL;
static History *hist = NULL;
int num = 0;
int len;
const char *bp = NULL;
for (;;) {
@ -170,8 +171,9 @@ cmdscanner()
if ((bp = el_gets(el, &num)) == NULL || num == 0)
return;
memcpy(cmdline, bp, (MAX_CMDLINE > num ? MAX_CMDLINE : num));
cmdline[num] = 0;
len = (num > MAX_CMDLINE) ? MAX_CMDLINE : num);
memcpy(cmdline, bp, len);
cmdline[len] = 0;
history(hist, H_ENTER, bp);
} else {

6
usr.sbin/xntpd/xntpdc/ntpdc.c
View File

@ -808,6 +808,7 @@ getcmds()
static History *hist = NULL;
char line[MAXLINE];
int num = 0;
int len;
const char *bp = NULL;
for (;;) {
@ -825,8 +826,9 @@ getcmds()
if ((bp = el_gets(el, &num)) == NULL || num == 0)
return;
memcpy(line, bp, (MAXLINE > num ? MAXLINE : num));
line[num] = 0;
len = (num > MAX_CMDLINE) ? MAX_CMDLINE : num);
memcpy(line, bp, len);
line[len] = 0;
history(hist, H_ENTER, bp);
} else {