Index: lib/libc/gen/getusershell.c
===================================================================
--- lib/libc/gen/getusershell.c
+++ lib/libc/gen/getusershell.c
@@ -119,13 +119,16 @@
 	while (fgets(cp, MAXPATHLEN + 1, fp) != NULL) {
 		while (*cp != '#' && *cp != '/' && *cp != '\0')
 			cp++;
-		if (*cp == '#' || *cp == '\0')
+		if (*cp == '#' || *cp == '\0') {
+			cp = line;
 			continue;
+		}
 		sp = cp;
 		while (!isspace(*cp) && *cp != '#' && *cp != '\0')
 			cp++;
-		*cp++ = '\0';
+		*cp = '\0';
 		sl_add(sl, strdup(sp));
+		cp = line;
 	}
 	(void)fclose(fp);
 	return NS_SUCCESS;