diff options
Diffstat (limited to 'utility.c')
-rw-r--r-- | utility.c | 17 |
1 files changed, 10 insertions, 7 deletions
@@ -877,29 +877,32 @@ extern int parse_mode(const char *s, mode_t * theMode) | |||
877 | #if defined BB_CHMOD_CHOWN_CHGRP || defined BB_PS || defined BB_LS \ | 877 | #if defined BB_CHMOD_CHOWN_CHGRP || defined BB_PS || defined BB_LS \ |
878 | || defined BB_TAR || defined BB_ID || defined BB_LOGGER \ | 878 | || defined BB_TAR || defined BB_ID || defined BB_LOGGER \ |
879 | || defined BB_LOGNAME || defined BB_WHOAMI || defined BB_SH | 879 | || defined BB_LOGNAME || defined BB_WHOAMI || defined BB_SH |
880 | |||
881 | #if defined BB_CHMOD_CHOWN_CHGRP || defined BB_ID | ||
880 | /* returns a uid given a username */ | 882 | /* returns a uid given a username */ |
881 | long my_getpwnam(char *name) | 883 | long my_getpwnam(const char *name) |
882 | { | 884 | { |
883 | struct passwd *myuser; | 885 | struct passwd *myuser; |
884 | 886 | ||
885 | myuser = getpwnam(name); | 887 | myuser = getpwnam(name); |
886 | if (myuser==NULL) | 888 | if (myuser==NULL) |
887 | return(-1); | 889 | error_msg_and_die("unknown user name: %s", name); |
888 | 890 | ||
889 | return myuser->pw_uid; | 891 | return myuser->pw_uid; |
890 | } | 892 | } |
891 | 893 | ||
892 | /* returns a gid given a group name */ | 894 | /* returns a gid given a group name */ |
893 | long my_getgrnam(char *name) | 895 | long my_getgrnam(const char *name) |
894 | { | 896 | { |
895 | struct group *mygroup; | 897 | struct group *mygroup; |
896 | 898 | ||
897 | mygroup = getgrnam(name); | 899 | mygroup = getgrnam(name); |
898 | if (mygroup==NULL) | 900 | if (mygroup==NULL) |
899 | return(-1); | 901 | error_msg_and_die("unknown group name: %s", name); |
900 | 902 | ||
901 | return (mygroup->gr_gid); | 903 | return (mygroup->gr_gid); |
902 | } | 904 | } |
905 | #endif | ||
903 | 906 | ||
904 | /* gets a username given a uid */ | 907 | /* gets a username given a uid */ |
905 | void my_getpwuid(char *name, long uid) | 908 | void my_getpwuid(char *name, long uid) |
@@ -927,18 +930,18 @@ void my_getgrgid(char *group, long gid) | |||
927 | 930 | ||
928 | #if defined BB_ID | 931 | #if defined BB_ID |
929 | /* gets a gid given a user name */ | 932 | /* gets a gid given a user name */ |
930 | long my_getpwnamegid(char *name) | 933 | long my_getpwnamegid(const char *name) |
931 | { | 934 | { |
932 | struct group *mygroup; | 935 | struct group *mygroup; |
933 | struct passwd *myuser; | 936 | struct passwd *myuser; |
934 | 937 | ||
935 | myuser=getpwnam(name); | 938 | myuser=getpwnam(name); |
936 | if (myuser==NULL) | 939 | if (myuser==NULL) |
937 | error_msg_and_die( "unknown user name: %s", name); | 940 | error_msg_and_die("unknown user name: %s", name); |
938 | 941 | ||
939 | mygroup = getgrgid(myuser->pw_gid); | 942 | mygroup = getgrgid(myuser->pw_gid); |
940 | if (mygroup==NULL) | 943 | if (mygroup==NULL) |
941 | error_msg_and_die( "unknown gid %ld", (long)myuser->pw_gid); | 944 | error_msg_and_die("unknown gid %ld", (long)myuser->pw_gid); |
942 | 945 | ||
943 | return mygroup->gr_gid; | 946 | return mygroup->gr_gid; |
944 | } | 947 | } |