diff options
| author | mdodd <mdodd@FreeBSD.org> | 1999-08-20 01:24:35 +0000 |
|---|---|---|
| committer | mdodd <mdodd@FreeBSD.org> | 1999-08-20 01:24:35 +0000 |
| commit | add3f6325f928a3acb756b34b7018942f7cfdbd7 (patch) | |
| tree | 24613bef7b6a7a588e0ea9bee3aa1b944b0cc8d2 /usr.sbin/lpr | |
| parent | b47bf1ab5f378718e3afceba062ddbe540147e75 (diff) | |
| download | FreeBSD-src-add3f6325f928a3acb756b34b7018942f7cfdbd7.zip FreeBSD-src-add3f6325f928a3acb756b34b7018942f7cfdbd7.tar.gz | |
What the heck was I thinking? Nobody else saw this? Sheesh.
(num > MAX) ? MAX : num
rather than
(MAX > num) ? MAX : num
Also, make things a little easier to read while I'm here.
Diffstat (limited to 'usr.sbin/lpr')
| -rw-r--r-- | usr.sbin/lpr/lpc/lpc.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/usr.sbin/lpr/lpc/lpc.c b/usr.sbin/lpr/lpc/lpc.c index b8ee565..2372211 100644 --- a/usr.sbin/lpr/lpc/lpc.c +++ b/usr.sbin/lpr/lpc/lpc.c @@ -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 { |
