svn commit: trunk/busybox/coreutils

[landley at busybox.net]

Author: landley
Date: 2006-01-08 19:45:43 -0800 (Sun, 08 Jan 2006)
New Revision: 13193

Log:
Fix bug 603: "chown :root thingy" should work now.


Modified:
   trunk/busybox/coreutils/chown.c


Changeset:
Modified: trunk/busybox/coreutils/chown.c
===================================================================
--- trunk/busybox/coreutils/chown.c	2006-01-09 03:40:40 UTC (rev 13192)
+++ trunk/busybox/coreutils/chown.c	2006-01-09 03:45:43 UTC (rev 13193)
@@ -17,8 +17,8 @@
 #include <string.h>
 #include "busybox.h"
 
-static long uid;
-static long gid;
+static uid_t uid = -1;
+static gid_t gid = -1;
 
 static int (*chown_func)(const char *, uid_t, gid_t) = chown;
 
@@ -57,15 +57,12 @@
 		groupName = strchr(*argv, ':');
 	}
 
-	gid = -1;
+	/* Check for the username and groupname */
 	if (groupName) {
 		*groupName++ = '\0';
 		gid = get_ug_id(groupName, bb_xgetgrnam);
 	}
-
-	/* Now check for the username */
-	uid = get_ug_id(*argv, bb_xgetpwnam);
-
+	if (--groupName != *argv) uid = get_ug_id(*argv, bb_xgetpwnam);
 	++argv;
 
 	/* Ok, ready to do the deed now */