[git commit] busybox.conf: code shrink

Denys Vlasenko vda.linux at googlemail.com
Mon May 16 12:30:26 UTC 2011


commit: http://git.busybox.net/busybox/commit/?id=351fec332a074cc7599e34c70e00f53d8ef74df9
branch: http://git.busybox.net/busybox/commit/?id=refs/heads/master

Signed-off-by: Denys Vlasenko <vda.linux at googlemail.com>
---
 libbb/appletlib.c |   25 ++++++++++++-------------
 1 files changed, 12 insertions(+), 13 deletions(-)

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 86b5cd3..30224ed 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -440,19 +440,18 @@ static void parse_config_file(void)
 				/* Now get the user/group info. */
 
 				s = skip_whitespace(e);
-				if (*s == '\0')
-					s = strcpy(buffer, "0.0");
-
-				/* We require whitespace between mode and USER.GROUP */
-				if ((s == e) || !(e = strchr(s, '.'))) {
-					errmsg = "uid.gid";
-					goto pe_label;
-				}
-
-				*e = ':'; /* get_uidgid needs USER:GROUP syntax */
-				if (get_uidgid(&sct->m_ugid, s, /*allow_numeric:*/ 1) == 0) {
-					errmsg = "unknown user/group";
-					goto pe_label;
+				/* Default is 0.0, else parse USER.GROUP: */
+				if (*s) {
+					/* We require whitespace between mode and USER.GROUP */
+					if ((s == e) || !(e = strchr(s, '.'))) {
+						errmsg = "uid.gid";
+						goto pe_label;
+					}
+					*e = ':'; /* get_uidgid needs USER:GROUP syntax */
+					if (get_uidgid(&sct->m_ugid, s, /*allow_numeric:*/ 1) == 0) {
+						errmsg = "unknown user/group";
+						goto pe_label;
+					}
 				}
 			}
 			continue;
-- 
1.7.3.4



More information about the busybox-cvs mailing list