Wed Sep 15 13:16:57 2021 UTC ()

Don't assign v to newvar, so we can still access the original length.


(christos)

diff -r1.59 -r1.60 src/bin/ps/keyword.c

--- src/bin/ps/keyword.c 2021/09/14 22:01:17	1.59
+++ src/bin/ps/keyword.c 2021/09/15 13:16:57	1.60

 @@ -1,14 +1,14 @@
-/*	$NetBSD: keyword.c,v 1.59 2021/09/14 22:01:17 christos Exp $	*/
+/*	$NetBSD: keyword.c,v 1.60 2021/09/15 13:16:57 christos Exp $	*/
 /*-
  * Copyright (c) 1990, 1993, 1994
  *	The Regents of the University of California.  All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -24,27 +24,27 @@
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #ifndef lint
 #if 0
 static char sccsid[] = "@(#)keyword.c	8.5 (Berkeley) 4/2/94";
 #else
-__RCSID("$NetBSD: keyword.c,v 1.59 2021/09/14 22:01:17 christos Exp $");
+__RCSID("$NetBSD: keyword.c,v 1.60 2021/09/15 13:16:57 christos Exp $");
 #endif
 #endif /* not lint */
 #include <sys/param.h>
 #include <sys/time.h>
 #include <sys/lwp.h>
 #include <sys/proc.h>
 #include <sys/resource.h>
 #include <sys/sysctl.h>
 #include <sys/ucred.h>
 #include <err.h>
 #include <errno.h>
 @@ -373,45 +373,44 @@ findvar(const char *p)
 	if (v && v->flag & ALIAS)
 		v = findvar(v->header);
 	if (!v) {
 		warnx("%s: keyword not found", p);
 		eval = 1;
 		return NULL;
+	}
 	if (!hp && *p == *pp)
 		return v;
 	struct var *newvar = emalloc(sizeof(*newvar));
 	*newvar = *v;
 	v = newvar;
 	if (hp) {
 		/*
 		 * Override the header.
+		 *
 		 * We need to copy the entry first, and override the
 		 * header in the copy, because the same field might be
 		 * used multiple times with different headers.  We also
 		 * need to strdup the header.
 		 */
 		newvar->header = estrdup(hp);
 		/*
 		 * According to P1003.1-2004, if the header text is null,
 		 * such as -o user=, the field width will be at least as
 		 * wide as the default header text.
 		 */
 		if (*hp == '\0')
 			newvar->width = strlen(v->header);
+	}
 	if (*p != *pp)
 		newvar->flag |= ALTPR|LJUST;
-	return v;
+	return newvar;
+}
 static int
 vcmp(const void *a, const void *b)
+{
         return strcmp(a, ((const VAR *)b)->name);
+}