X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=libpwdgrp%2Fpwd_grp.c;h=c9bbc8bdadce5ce754407d0b3e4128f40ec62fde;hb=31c765081dc41f158786545fbea9294be4685bd2;hp=90647e9d3a22b838587f7adde96b07afc1c4dd07;hpb=e5cae08f1232e66daca8f47f0f257a83a0cca9fa;p=oweals%2Fbusybox.git

diff --git a/libpwdgrp/pwd_grp.c b/libpwdgrp/pwd_grp.c
index 90647e9d3..c9bbc8bda 100644
--- a/libpwdgrp/pwd_grp.c
+++ b/libpwdgrp/pwd_grp.c
@@ -14,13 +14,12 @@
  *    exit using the atexit function to make valgrind happy.
  * 2) the passwd/group files:
  *      a) must contain the expected number of fields (as per count of field
- *         delimeters ":") or we will complain with a error message.
+ *         delimiters ":") or we will complain with a error message.
  *      b) leading and trailing whitespace in fields is stripped.
- *      c) some fields are not allowed to be empty (e.g. username, uid/gid,
- *         homedir, shell) and in this case NULL is returned and errno is
- *         set to EINVAL. This behaviour could be easily changed by
- *         modifying PW_DEF, GR_DEF, SP_DEF strings (uppercase
- *         makes a field mandatory).
+ *      c) some fields are not allowed to be empty (e.g. username, uid/gid),
+ *         and in this case NULL is returned and errno is set to EINVAL.
+ *         This behaviour could be easily changed by modifying PW_DEF, GR_DEF,
+ *         SP_DEF strings (uppercase makes a field mandatory).
  *      d) the string representing uid/gid must be convertible by strtoXX
  *         functions, or errno is set to EINVAL.
  *      e) leading and trailing whitespace in group member names is stripped.
@@ -58,7 +57,7 @@ struct passdb {
  * I = uid,gid, l = long maybe empty, m = members,
  * r = reserved
  */
-#define PW_DEF "SsIIsSS"
+#define PW_DEF "SsIIsss"
 #define GR_DEF "SsIm"
 #define SP_DEF "Ssllllllr"
 
@@ -70,8 +69,8 @@ static const struct const_passdb const_pw_db = {
 		offsetof(struct passwd, pw_uid),        /* 2 I */
 		offsetof(struct passwd, pw_gid),        /* 3 I */
 		offsetof(struct passwd, pw_gecos),      /* 4 s */
-		offsetof(struct passwd, pw_dir),        /* 5 S */
-		offsetof(struct passwd, pw_shell)       /* 6 S */
+		offsetof(struct passwd, pw_dir),        /* 5 s */
+		offsetof(struct passwd, pw_shell)       /* 6 s */
 	},
 	sizeof(PW_DEF)-1, sizeof(struct passwd)
 };
@@ -122,7 +121,7 @@ static struct statics *ptr_to_statics;
 #if ENABLE_FEATURE_CLEAN_UP
 static void free_static(void)
 {
-    	free(S.db[0].malloced);
+	free(S.db[0].malloced);
 	free(S.db[1].malloced);
 # if ENABLE_USE_BB_SHADOW
 	free(S.db[2].malloced);
@@ -150,7 +149,7 @@ static struct statics *get_S(void)
 /* Internal functions */
 
 /* Divide the passwd/group/shadow record in fields
- * by substituting the given delimeter
+ * by substituting the given delimiter
  * e.g. ':' or ',' with '\0'.
  * Returns the number of fields found.
  * Strips leading and trailing whitespace in fields.
@@ -336,6 +335,22 @@ static int massage_data_for_r_func(struct passdb *db,
 	return errno;
 }
 
+static void* massage_data_for_non_r_func(struct passdb *db, char *buf)
+{
+	if (!buf)
+		return NULL;
+
+	free(db->malloced);
+	/* We enlarge buf and move string data up, freeing space
+	 * for struct passwd/group/spwd at the beginning. This way,
+	 * entire result of getXXnam is in a single malloced block.
+	 * This enables easy creation of xmalloc_getpwnam() API.
+	 */
+	db->malloced = buf = xrealloc(buf, db->size_of + S.string_size);
+	memmove(buf + db->size_of, buf, S.string_size);
+	return convert_to_struct(db, buf + db->size_of, buf);
+}
+
 /****** getXXnam/id_r */
 
 static int FAST_FUNC getXXnam_r(const char *name, uintptr_t db_and_field_pos,
@@ -372,6 +387,7 @@ int FAST_FUNC getspnam_r(const char *name, struct spwd *struct_buf, char *buffer
 }
 #endif
 
+#ifdef UNUSED
 /****** getXXent_r */
 
 static int FAST_FUNC getXXent_r(uintptr_t db_idx, char *buffer, size_t buflen,
@@ -400,16 +416,14 @@ int FAST_FUNC getpwent_r(struct passwd *struct_buf, char *buffer, size_t buflen,
 	*result = struct_buf;
 	return getXXent_r(0, buffer, buflen, result);
 }
+#endif
 
-/****** getXXnam/id */
+/****** getXXent */
 
-static void* FAST_FUNC getXXnam(const char *name, unsigned db_and_field_pos)
+static void* FAST_FUNC getXXent(uintptr_t db_idx)
 {
 	char *buf;
-	void *result;
-	struct passdb *db = &get_S()->db[db_and_field_pos >> 2];
-
-	result = NULL;
+	struct passdb *db = &get_S()->db[db_idx];
 
 	if (!db->fp) {
 		db->fp = fopen_for_read(db->filename);
@@ -419,19 +433,24 @@ static void* FAST_FUNC getXXnam(const char *name, unsigned db_and_field_pos)
 		close_on_exec_on(fileno(db->fp));
 	}
 
-	buf = parse_common(db->fp, db, name, db_and_field_pos & 3);
-	if (buf) {
-		free(db->malloced);
-		/* We enlarge buf and move string data up, freeing space
-		 * for struct passwd/group/spwd at the beginning. This way,
-		 * entire result of getXXnam is in a single malloced block.
-		 * This enables easy creation of xmalloc_getpwnam() API.
-		 */
-		db->malloced = buf = xrealloc(buf, db->size_of + S.string_size);
-		memmove(buf + db->size_of, buf, S.string_size);
-		result = convert_to_struct(db, buf + db->size_of, buf);
-	}
-	return result;
+	buf = parse_common(db->fp, db, /*no search key:*/ NULL, -1);
+	return massage_data_for_non_r_func(db, buf);
+}
+
+struct passwd* FAST_FUNC getpwent(void)
+{
+	return getXXent(0);
+}
+
+/****** getXXnam/id */
+
+static void* FAST_FUNC getXXnam(const char *name, unsigned db_and_field_pos)
+{
+	char *buf;
+	struct passdb *db = &get_S()->db[db_and_field_pos >> 2];
+
+	buf = parse_file(db, name, db_and_field_pos & 3);
+	return massage_data_for_non_r_func(db, buf);
 }
 
 struct passwd* FAST_FUNC getpwnam(const char *name)