diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | libbb/my_getgrgid.c | 55 | ||||
| -rw-r--r-- | libbb/my_getgrnam.c | 56 | ||||
| -rw-r--r-- | libbb/my_getpwnam.c | 56 | ||||
| -rw-r--r-- | libbb/my_getpwnamegid.c (renamed from libbb/pwd_grp_wrappers.c) | 48 | ||||
| -rw-r--r-- | libbb/my_getpwuid.c | 55 |
6 files changed, 225 insertions, 50 deletions
@@ -230,7 +230,8 @@ find_mount_point.c find_pid_by_name.c find_root_device.c full_read.c \ full_write.c get_console.c get_last_path_component.c get_line_from_file.c \ human_readable.c inode_hash.c isdirectory.c kernel_version.c loop.c \ mode_string.c parse_mode.c parse_number.c print_file.c process_escape_sequence.c \ -pwd_grp_wrappers.c recursive_action.c safe_read.c safe_strncpy.c syscalls.c \ +my_getgrgid.c my_getpwnamegid.c my_getpwuid.c my_getgrnam.c my_getpwnam.c \ +recursive_action.c safe_read.c safe_strncpy.c syscalls.c \ syslog_msg_with_name.c time_string.c trim.c vdprintf.c wfopen.c xfuncs.c \ xregcomp.c LIBBB_OBJS=$(patsubst %.c,$(LIBBB)/%.o, $(LIBBB_CSRC)) @@ -322,7 +323,7 @@ $(PWD_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile - mkdir -p $(PWD_GRP) $(CC) $(CFLAGS) $(PWD_CFLAGS) -c $< -o $*.o -$(LIBBB_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile +$(LIBBB_OBJS): %.o: %.c Config.h busybox.h applets.h Makefile libbb/libbb.h - mkdir -p $(LIBBB) $(CC) $(CFLAGS) $(LIBBB_CFLAGS) -c $< -o $*.o diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c new file mode 100644 index 000000000..fabd4776c --- /dev/null +++ b/libbb/my_getgrgid.c @@ -0,0 +1,55 @@ +/* vi: set sw=4 ts=4: */ +/* + * Utility routines. + * + * Copyright (C) tons of folks. Tracking down who wrote what + * isn't something I'm going to worry about... If you wrote something + * here, please feel free to acknowledge your work. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Based in part on code from sash, Copyright (c) 1999 by David I. Bell + * Permission has been granted to redistribute this code under the GPL. + * + */ + +#include <stdio.h> +#include <string.h> +#include "../pwd_grp/pwd.h" +#include "../pwd_grp/grp.h" +#include "libbb.h" + + +/* gets a groupname given a gid */ +void my_getgrgid(char *group, long gid) +{ + struct group *mygroup; + + mygroup = getgrgid(gid); + if (mygroup==NULL) + sprintf(group, "%-8ld ", (long)gid); + else + strcpy(group, mygroup->gr_name); +} + + +/* END CODE */ +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ diff --git a/libbb/my_getgrnam.c b/libbb/my_getgrnam.c new file mode 100644 index 000000000..e3226a275 --- /dev/null +++ b/libbb/my_getgrnam.c @@ -0,0 +1,56 @@ +/* vi: set sw=4 ts=4: */ +/* + * Utility routines. + * + * Copyright (C) tons of folks. Tracking down who wrote what + * isn't something I'm going to worry about... If you wrote something + * here, please feel free to acknowledge your work. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Based in part on code from sash, Copyright (c) 1999 by David I. Bell + * Permission has been granted to redistribute this code under the GPL. + * + */ + +#include <stdio.h> +#include <string.h> +#include "../pwd_grp/pwd.h" +#include "../pwd_grp/grp.h" +#include "libbb.h" + + + +/* returns a gid given a group name */ +long my_getgrnam(const char *name) +{ + struct group *mygroup; + + mygroup = getgrnam(name); + if (mygroup==NULL) + error_msg_and_die("unknown group name: %s", name); + + return (mygroup->gr_gid); +} + + +/* END CODE */ +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ diff --git a/libbb/my_getpwnam.c b/libbb/my_getpwnam.c new file mode 100644 index 000000000..ae73ae7f1 --- /dev/null +++ b/libbb/my_getpwnam.c @@ -0,0 +1,56 @@ +/* vi: set sw=4 ts=4: */ +/* + * Utility routines. + * + * Copyright (C) tons of folks. Tracking down who wrote what + * isn't something I'm going to worry about... If you wrote something + * here, please feel free to acknowledge your work. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Based in part on code from sash, Copyright (c) 1999 by David I. Bell + * Permission has been granted to redistribute this code under the GPL. + * + */ + +#include <stdio.h> +#include <string.h> +#include "../pwd_grp/pwd.h" +#include "../pwd_grp/grp.h" +#include "libbb.h" + + + +/* returns a uid given a username */ +long my_getpwnam(const char *name) +{ + struct passwd *myuser; + + myuser = getpwnam(name); + if (myuser==NULL) + error_msg_and_die("unknown user name: %s", name); + + return myuser->pw_uid; +} + + +/* END CODE */ +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ diff --git a/libbb/pwd_grp_wrappers.c b/libbb/my_getpwnamegid.c index e7b7e3820..fb3d148ce 100644 --- a/libbb/pwd_grp_wrappers.c +++ b/libbb/my_getpwnamegid.c @@ -33,54 +33,6 @@ -/* returns a uid given a username */ -long my_getpwnam(const char *name) -{ - struct passwd *myuser; - - myuser = getpwnam(name); - if (myuser==NULL) - error_msg_and_die("unknown user name: %s", name); - - return myuser->pw_uid; -} - -/* returns a gid given a group name */ -long my_getgrnam(const char *name) -{ - struct group *mygroup; - - mygroup = getgrnam(name); - if (mygroup==NULL) - error_msg_and_die("unknown group name: %s", name); - - return (mygroup->gr_gid); -} - -/* gets a username given a uid */ -void my_getpwuid(char *name, long uid) -{ - struct passwd *myuser; - - myuser = getpwuid(uid); - if (myuser==NULL) - sprintf(name, "%-8ld ", (long)uid); - else - strcpy(name, myuser->pw_name); -} - -/* gets a groupname given a gid */ -void my_getgrgid(char *group, long gid) -{ - struct group *mygroup; - - mygroup = getgrgid(gid); - if (mygroup==NULL) - sprintf(group, "%-8ld ", (long)gid); - else - strcpy(group, mygroup->gr_name); -} - /* gets a gid given a user name */ long my_getpwnamegid(const char *name) { diff --git a/libbb/my_getpwuid.c b/libbb/my_getpwuid.c new file mode 100644 index 000000000..46c7a884a --- /dev/null +++ b/libbb/my_getpwuid.c @@ -0,0 +1,55 @@ +/* vi: set sw=4 ts=4: */ +/* + * Utility routines. + * + * Copyright (C) tons of folks. Tracking down who wrote what + * isn't something I'm going to worry about... If you wrote something + * here, please feel free to acknowledge your work. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + * + * Based in part on code from sash, Copyright (c) 1999 by David I. Bell + * Permission has been granted to redistribute this code under the GPL. + * + */ + +#include <stdio.h> +#include <string.h> +#include "../pwd_grp/pwd.h" +#include "../pwd_grp/grp.h" +#include "libbb.h" + + + +/* gets a username given a uid */ +void my_getpwuid(char *name, long uid) +{ + struct passwd *myuser; + + myuser = getpwuid(uid); + if (myuser==NULL) + sprintf(name, "%-8ld ", (long)uid); + else + strcpy(name, myuser->pw_name); +} + +/* END CODE */ +/* +Local Variables: +c-file-style: "linux" +c-basic-offset: 4 +tab-width: 4 +End: +*/ |