X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;ds=sidebyside;f=chmod_chown_chgrp.c;h=9714e1ca57ed84a017dfe1294dc23e137f4c93bf;hb=53265546a69d5810d5e19b22d6a5095f04eca6be;hp=a3af4fbb3f36fb79653cc386c5618c43db573d9d;hpb=eec2f63b3f6117256e0d8f328e40a63bcab84bb4;p=oweals%2Fbusybox.git

diff --git a/chmod_chown_chgrp.c b/chmod_chown_chgrp.c
index a3af4fbb3..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,21 +22,21 @@
  *
  */
 
-#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 unsigned long uid = -1;
-static unsigned long gid = -1;
+static long uid = -1;
+static long gid = -1;
 static int whichApp;
-static char *invocationName = NULL;
 static char *theMode = NULL;
 
 
@@ -44,34 +44,12 @@ static char *theMode = NULL;
 #define CHOWN_APP   2
 #define CHMOD_APP   3
 
-static const char chgrp_usage[] = "chgrp [OPTION]... GROUP FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChange the group membership of each FILE to GROUP.\n"
-	"\nOptions:\n\t-R\tChanges files and directories recursively.\n"
-#endif
-	;
-static const char chown_usage[] =
-	"chown [OPTION]...  OWNER[<.|:>[GROUP] FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nChange the owner and/or group of each FILE to OWNER and/or GROUP.\n"
-	"\nOptions:\n\t-R\tChanges files and directories recursively.\n"
-#endif
-	;
-static const char chmod_usage[] =
-	"chmod [-R] MODE[,MODE]... FILE...\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-	"\nEach MODE is one or more of the letters ugoa, one of the symbols +-= and\n"
-	"one or more of the letters rwxst.\n\n"
-	"\nOptions:\n\t-R\tChanges files and directories recursively.\n"
-#endif
-	;
-
-
 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,
@@ -88,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( "%s: unknown mode: %s\n", invocationName, theMode);
+			error_msg_and_die( "unknown mode: %s", theMode);
 		}
 		if (chmod(fileName, statbuf->st_mode) == 0)
 			return (TRUE);
@@ -100,44 +78,43 @@ static int fileAction(const char *fileName, struct stat *statbuf, void* junk)
 
 int chmod_chown_chgrp_main(int argc, char **argv)
 {
+	int stopIt = FALSE;
 	int recursiveFlag = FALSE;
-	char *groupName;
-	char *p;
-	const char *appUsage;
-
-	whichApp = (strcmp(*argv, "chown") == 0)? 
-			CHOWN_APP : (strcmp(*argv, "chmod") == 0)? 
-				CHMOD_APP : CHGRP_APP;
+	char *groupName=NULL;
+	char *p=NULL;
 
-	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);
-	invocationName = *argv;
+		show_usage();
 	argv++;
 
 	/* Parse options */
 	while (--argc >= 0 && *argv && (**argv == '-')) {
-		while (*++(*argv))
+		while (stopIt==FALSE && *++(*argv)) {
 			switch (**argv) {
 				case 'R':
 					recursiveFlag = TRUE;
 					break;
 				default:
-					fprintf(stderr, invalid_option, invocationName, **argv);
-					usage(appUsage);
+					theMode=*argv-1;
+					stopIt = TRUE;
 			}
+		}
+		if (stopIt==TRUE)
+			break;
 		argv++;
 	}
 
 	if (argc == 0 || *argv == NULL) {
-		fprintf(stderr, too_few_args, invocationName);
-		usage(appUsage);
+		error_msg(too_few_args);
 	}
 
 	if (whichApp == CHMOD_APP) {
-		theMode = *argv;
+		if (theMode==NULL)
+			theMode = *argv;
 	} else {
 
 		/* Find the selected group */
@@ -146,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)
@@ -157,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;
 		}
@@ -169,26 +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( "%s: unknown user name: %s\n", 
-						invocationName, *argv);
-			}
 		}
 	}
 
 	/* Ok, ready to do the deed now */
-	if (argc <= 1) {
-		fatalError( "%s: too few arguments\n", invocationName);
+	if (argc < 1) {
+		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( "%s: unknown group name: %s\n", invocationName, groupName);
 }
 
 /*