Module Name: src
Committed By: martin
Date: Mon Nov 25 10:16:48 UTC 2024
Modified Files:
src/usr.bin/getent [netbsd-9]: getent.c
Log Message:
Pull up following revision(s) (requested by kre in ticket #1929):
usr.bin/getent/getent.c: revision 1.20
usr.bin/getent/getent.c: revision 1.21
PR bin/58836 make sure all 3 colons are printed for group database
I took a look, and didn't see any other cases where there was a similar issue.
White space. NFC.
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.19.34.1 src/usr.bin/getent/getent.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/getent/getent.c
diff -u src/usr.bin/getent/getent.c:1.19 src/usr.bin/getent/getent.c:1.19.34.1
--- src/usr.bin/getent/getent.c:1.19 Thu Mar 15 02:02:23 2012
+++ src/usr.bin/getent/getent.c Mon Nov 25 10:16:48 2024
@@ -1,4 +1,4 @@
-/* $NetBSD: getent.c,v 1.19 2012/03/15 02:02:23 joerg Exp $ */
+/* $NetBSD: getent.c,v 1.19.34.1 2024/11/25 10:16:48 martin Exp $ */
/*-
* Copyright (c) 2004-2006 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: getent.c,v 1.19 2012/03/15 02:02:23 joerg Exp $");
+__RCSID("$NetBSD: getent.c,v 1.19.34.1 2024/11/25 10:16:48 martin Exp $");
#endif /* not lint */
#include <sys/socket.h>
@@ -252,7 +252,7 @@ group(int argc, char *argv[])
assert(argc > 1);
assert(argv != NULL);
-#define GROUPPRINT printfmtstrings(gr->gr_mem, ":", ",", "%s:%s:%u", \
+#define GROUPPRINT printfmtstrings(gr->gr_mem, "", ",", "%s:%s:%u:", \
gr->gr_name, gr->gr_passwd, gr->gr_gid)
(void)setgroupent(1);
@@ -644,7 +644,7 @@ handlecap(const char *db, int argc, char
if (cap) {
capprint(cap);
break;
- }
+ }
}
if (j == sizeof(sfx) - 1)
printf("false\n");
@@ -735,7 +735,7 @@ rpc(int argc, char *argv[])
struct rpcent *re;
unsigned long id;
int i, rv;
-
+
assert(argc > 1);
assert(argv != NULL);
