From 0b2d7c2ffc8249404106189cd735065ff2c49409 Mon Sep 17 00:00:00 2001 From: "Matthew N. Dodd" Date: Fri, 20 Aug 1999 01:24:35 +0000 Subject: 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. --- usr.sbin/cdcontrol/cdcontrol.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'usr.sbin/cdcontrol') diff --git a/usr.sbin/cdcontrol/cdcontrol.c b/usr.sbin/cdcontrol/cdcontrol.c index 539cf52bad88..ed4f433ea57f 100644 --- a/usr.sbin/cdcontrol/cdcontrol.c +++ b/usr.sbin/cdcontrol/cdcontrol.c @@ -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 @@ -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 -- cgit v1.3