X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=chmod_chown_chgrp.c;h=9714e1ca57ed84a017dfe1294dc23e137f4c93bf;hb=a283157c3832f151fa9f5abf5f18c56d05e5815d;hp=b347707eeb46d1ca008d0b78fef51d25cdf2c4f4;hpb=ce82c8ab7782d30ae639652f10d9d9f4069410aa;p=oweals%2Fbusybox.git

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index b347707ee..9714e1ca5 100644
--- a/chmod_chown_chgrp.c
+++ b/chmod_chown_chgrp.c
@@ -3,7 +3,7 @@
  * Mini chown/chmod/chgrp implementation for busybox
  *
  *
- * Copyright (C) 1999,2000 by Lineo, inc.
+ * Copyright (C) 1999,2000,2001 by Lineo, inc.
  * Written by Erik Andersen <andersen@lineo.com>, <andersee@debian.org>
  *
  * This program is free software; you can redistribute it and/or modify
@@ -22,15 +22,16 @@
  *
  */
 
-#include "internal.h"
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+#include "busybox.h"
 #define BB_DECLARE_EXTERN
 #define bb_need_invalid_option
 #define bb_need_too_few_args
 #include "messages.c"
 
-#include <stdio.h>
-#include <grp.h>
-#include <pwd.h>
 
 
 static long uid = -1;
@@ -48,6 +49,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 	switch (whichApp) {
 	case CHGRP_APP:
 	case CHOWN_APP:
+	/* Don't use lchown for libc5 or glibc older then 2.1.x */
 #if (__GLIBC__ >= 2) && (__GLIBC_MINOR__ >= 1)
 		if (lchown
 			(fileName, (whichApp == CHOWN_APP) ? uid : statbuf->st_uid,
@@ -64,7 +66,7 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 	case CHMOD_APP:
 		/* Parse the specified modes */
 		if (parse_mode(theMode, &(statbuf->st_mode)) == FALSE) {
-			fatalError( "unknown mode: %s\n", theMode);
+			error_msg_and_die( "unknown mode: %s", theMode);
 		}
 		if (chmod(fileName, statbuf->st_mode) == 0)
 			return (TRUE);
@@ -80,17 +82,13 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 	int recursiveFlag = FALSE;
 	char *groupName=NULL;
 	char *p=NULL;
-	const char *appUsage;
 
-	whichApp = (strcmp(applet_name, "chown") == 0)? 
-			CHOWN_APP : (strcmp(applet_name, "chmod") == 0)? 
-				CHMOD_APP : CHGRP_APP;
-
-	appUsage = (whichApp == CHOWN_APP)? 
-			chown_usage : (whichApp == CHMOD_APP) ? chmod_usage : chgrp_usage;
+	whichApp = (applet_name[2]=='o')?           /* chown */
+		CHOWN_APP : (applet_name[2]=='m')?      /* chmod */
+		CHMOD_APP : CHGRP_APP;
 
 	if (argc < 2)
-		usage(appUsage);
+		show_usage();
 	argv++;
 
 	/* Parse options */
@@ -111,7 +109,7 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 	}
 
 	if (argc == 0 || *argv == NULL) {
-		errorMsg(too_few_args);
+		error_msg(too_few_args);
 	}
 
 	if (whichApp == CHMOD_APP) {
@@ -125,8 +123,6 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 			gid = strtoul(groupName, &p, 10);	/* maybe it's already numeric */
 			if (groupName == p)
 				gid = my_getgrnam(groupName);
-			if (gid == -1)
-				goto bad_group;
 		} else {
 			groupName = strchr(*argv, '.');
 			if (groupName == NULL)
@@ -136,8 +132,6 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 				gid = strtoul(groupName, &p, 10);
 				if (groupName == p)
 					gid = my_getgrnam(groupName);
-				if (gid == -1)
-					goto bad_group;
 			} else
 				gid = -1;
 		}
@@ -148,25 +142,20 @@ int chmod_chown_chgrp_main(int argc, char **argv)
 			uid = strtoul(*argv, &p, 10);	/* if numeric ... */
 			if (*argv == p)
 				uid = my_getpwnam(*argv);
-			if (uid == -1) {
-				fatalError( "unknown user name: %s\n", *argv);
-			}
 		}
 	}
 
 	/* Ok, ready to do the deed now */
 	if (argc < 1) {
-		fatalError(too_few_args);
+		error_msg_and_die(too_few_args);
 	}
 	while (argc-- > 1) {
-		if (recursiveAction (*(++argv), recursiveFlag, FALSE, FALSE, 
+		if (recursive_action (*(++argv), recursiveFlag, FALSE, FALSE, 
 					fileAction, fileAction, NULL) == FALSE)
-			exit(FALSE);
+			return EXIT_FAILURE;
 	}
-	exit(TRUE);
+	return EXIT_SUCCESS;
 
-  bad_group:
-	fatalError( "unknown group name: %s\n", groupName);
 }
 
 /*