diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-09-20 21:08:10 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2005-09-20 21:08:10 +0000 |
commit | f56b8e4b0067c9cd7cdf11f3aa9bfaa4e055a722 (patch) | |
tree | 1183359fc1238f1b425728d51bf6498c05b41ecc /libbb | |
parent | d5bd137a247145afabfbc3a3c376ad8787381d8f (diff) | |
download | busybox-w32-f56b8e4b0067c9cd7cdf11f3aa9bfaa4e055a722.tar.gz busybox-w32-f56b8e4b0067c9cd7cdf11f3aa9bfaa4e055a722.tar.bz2 busybox-w32-f56b8e4b0067c9cd7cdf11f3aa9bfaa4e055a722.zip |
- consolidated password helpers into bb_pwd.c
Diffstat (limited to 'libbb')
-rw-r--r-- | libbb/get_ug_id.c | 30 | ||||
-rw-r--r-- | libbb/my_getgrgid.c | 57 | ||||
-rw-r--r-- | libbb/my_getgrnam.c | 49 | ||||
-rw-r--r-- | libbb/my_getpwnam.c | 49 | ||||
-rw-r--r-- | libbb/my_getpwuid.c | 56 | ||||
-rw-r--r-- | libbb/my_getug.c | 64 |
6 files changed, 0 insertions, 305 deletions
diff --git a/libbb/get_ug_id.c b/libbb/get_ug_id.c deleted file mode 100644 index b0b9b2e53..000000000 --- a/libbb/get_ug_id.c +++ /dev/null | |||
@@ -1,30 +0,0 @@ | |||
1 | /* | ||
2 | * This program is free software; you can redistribute it and/or modify | ||
3 | * it under the terms of the GNU General Public License as published by | ||
4 | * the Free Software Foundation; either version 2 of the License, or | ||
5 | * (at your option) any later version. | ||
6 | * | ||
7 | * This program is distributed in the hope that it will be useful, | ||
8 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
9 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
10 | * GNU Library General Public License for more details. | ||
11 | * | ||
12 | * You should have received a copy of the GNU General Public License | ||
13 | * along with this program; if not, write to the Free Software | ||
14 | * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. | ||
15 | */ | ||
16 | |||
17 | #include <stdlib.h> | ||
18 | |||
19 | extern unsigned long get_ug_id(const char *s, long (*my_getxxnam)(const char *)) | ||
20 | { | ||
21 | unsigned long r; | ||
22 | char *p; | ||
23 | |||
24 | r = strtoul(s, &p, 10); | ||
25 | if (*p || (s == p)) { | ||
26 | r = my_getxxnam(s); | ||
27 | } | ||
28 | |||
29 | return r; | ||
30 | } | ||
diff --git a/libbb/my_getgrgid.c b/libbb/my_getgrgid.c deleted file mode 100644 index 9ac14a34e..000000000 --- a/libbb/my_getgrgid.c +++ /dev/null | |||
@@ -1,57 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Utility routines. | ||
4 | * | ||
5 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | |||
22 | /* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more | ||
23 | * flexible : | ||
24 | * | ||
25 | * if bufsize is > 0 char *group cannot be set to NULL. | ||
26 | * On success groupname is written on static allocated buffer group | ||
27 | * (and a pointer to it is returned). | ||
28 | * On failure gid as string is written to static allocated buffer | ||
29 | * group and NULL is returned. | ||
30 | * if bufsize is = 0 char *group can be set to NULL. | ||
31 | * On success groupname is returned. | ||
32 | * On failure NULL is returned. | ||
33 | * if bufsize is < 0 char *group can be set to NULL. | ||
34 | * On success groupname is returned. | ||
35 | * On failure an error message is printed and the program exits. | ||
36 | */ | ||
37 | |||
38 | #include "libbb.h" | ||
39 | #include "grp_.h" | ||
40 | |||
41 | /* gets a groupname given a gid */ | ||
42 | char * my_getgrgid(char *group, long gid, int bufsize) | ||
43 | { | ||
44 | struct group *mygroup = getgrgid(gid); | ||
45 | |||
46 | return my_getug(group, (mygroup) ? mygroup->gr_name : (char *)mygroup, gid, bufsize, 'g'); | ||
47 | } | ||
48 | |||
49 | |||
50 | /* END CODE */ | ||
51 | /* | ||
52 | Local Variables: | ||
53 | c-file-style: "linux" | ||
54 | c-basic-offset: 4 | ||
55 | tab-width: 4 | ||
56 | End: | ||
57 | */ | ||
diff --git a/libbb/my_getgrnam.c b/libbb/my_getgrnam.c deleted file mode 100644 index 22a617cc8..000000000 --- a/libbb/my_getgrnam.c +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Utility routines. | ||
4 | * | ||
5 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | |||
22 | #include <stdio.h> | ||
23 | #include <string.h> | ||
24 | #include "libbb.h" | ||
25 | #include "pwd_.h" | ||
26 | #include "grp_.h" | ||
27 | |||
28 | |||
29 | /* returns a gid given a group name */ | ||
30 | long my_getgrnam(const char *name) | ||
31 | { | ||
32 | struct group *mygroup; | ||
33 | |||
34 | mygroup = getgrnam(name); | ||
35 | if (mygroup==NULL) | ||
36 | bb_error_msg_and_die("unknown group name: %s", name); | ||
37 | |||
38 | return (mygroup->gr_gid); | ||
39 | } | ||
40 | |||
41 | |||
42 | /* END CODE */ | ||
43 | /* | ||
44 | Local Variables: | ||
45 | c-file-style: "linux" | ||
46 | c-basic-offset: 4 | ||
47 | tab-width: 4 | ||
48 | End: | ||
49 | */ | ||
diff --git a/libbb/my_getpwnam.c b/libbb/my_getpwnam.c deleted file mode 100644 index a9fd0cd09..000000000 --- a/libbb/my_getpwnam.c +++ /dev/null | |||
@@ -1,49 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Utility routines. | ||
4 | * | ||
5 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | |||
22 | #include <stdio.h> | ||
23 | #include <string.h> | ||
24 | #include "libbb.h" | ||
25 | #include "pwd_.h" | ||
26 | #include "grp_.h" | ||
27 | |||
28 | |||
29 | /* returns a uid given a username */ | ||
30 | long my_getpwnam(const char *name) | ||
31 | { | ||
32 | struct passwd *myuser; | ||
33 | |||
34 | myuser = getpwnam(name); | ||
35 | if (myuser==NULL) | ||
36 | bb_error_msg_and_die("unknown user name: %s", name); | ||
37 | |||
38 | return myuser->pw_uid; | ||
39 | } | ||
40 | |||
41 | |||
42 | /* END CODE */ | ||
43 | /* | ||
44 | Local Variables: | ||
45 | c-file-style: "linux" | ||
46 | c-basic-offset: 4 | ||
47 | tab-width: 4 | ||
48 | End: | ||
49 | */ | ||
diff --git a/libbb/my_getpwuid.c b/libbb/my_getpwuid.c deleted file mode 100644 index 7da360ac8..000000000 --- a/libbb/my_getpwuid.c +++ /dev/null | |||
@@ -1,56 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Utility routines. | ||
4 | * | ||
5 | * Copyright (C) 1999-2004 by Erik Andersen <andersen@codepoet.org> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | |||
22 | /* Hacked by Tito Ragusa (c) 2004 <farmatito@tiscali.it> to make it more | ||
23 | * flexible : | ||
24 | * | ||
25 | * if bufsize is > 0 char *name can not be set to NULL. | ||
26 | * On success username is written on the static allocated buffer name | ||
27 | * (and a pointer to it is returned). | ||
28 | * On failure uid as string is written to the static allocated buffer name | ||
29 | * and NULL is returned. | ||
30 | * if bufsize is = 0 char *name can be set to NULL. | ||
31 | * On success username is returned. | ||
32 | * On failure NULL is returned. | ||
33 | * if bufsize is < 0 char *name can be set to NULL | ||
34 | * On success username is returned. | ||
35 | * On failure an error message is printed and the program exits. | ||
36 | */ | ||
37 | |||
38 | #include "libbb.h" | ||
39 | #include "pwd_.h" | ||
40 | |||
41 | /* gets a username given a uid */ | ||
42 | char * my_getpwuid(char *name, long uid, int bufsize) | ||
43 | { | ||
44 | struct passwd *myuser = getpwuid(uid); | ||
45 | |||
46 | return my_getug(name, (myuser) ? myuser->pw_name : (char *)myuser , uid, bufsize, 'u'); | ||
47 | } | ||
48 | |||
49 | /* END CODE */ | ||
50 | /* | ||
51 | Local Variables: | ||
52 | c-file-style: "linux" | ||
53 | c-basic-offset: 4 | ||
54 | tab-width: 4 | ||
55 | End: | ||
56 | */ | ||
diff --git a/libbb/my_getug.c b/libbb/my_getug.c deleted file mode 100644 index 9b7292d13..000000000 --- a/libbb/my_getug.c +++ /dev/null | |||
@@ -1,64 +0,0 @@ | |||
1 | /* vi: set sw=4 ts=4: */ | ||
2 | /* | ||
3 | * Utility routines. | ||
4 | * | ||
5 | * Copyright (C) 2004 by Tito Ragusa <farmatito@tiscali.it> | ||
6 | * | ||
7 | * This program is free software; you can redistribute it and/or modify | ||
8 | * it under the terms of the GNU General Public License as published by | ||
9 | * the Free Software Foundation; either version 2 of the License, or | ||
10 | * (at your option) any later version. | ||
11 | * | ||
12 | * This program is distributed in the hope that it will be useful, | ||
13 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
14 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
15 | * General Public License for more details. | ||
16 | * | ||
17 | * You should have received a copy of the GNU General Public License | ||
18 | * along with this program; if not, write to the Free Software | ||
19 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
20 | */ | ||
21 | |||
22 | /* | ||
23 | * | ||
24 | * if bufsize is > 0 char *buffer can not be set to NULL. | ||
25 | * If idname is not NULL it is written on the static allocated buffer | ||
26 | * (and a pointer to it is returned). | ||
27 | * if idname is NULL, id as string is written to the static allocated buffer | ||
28 | * and NULL is returned. | ||
29 | * if bufsize is = 0 char *buffer can be set to NULL. | ||
30 | * If idname exists a pointer to it is returned, | ||
31 | * else NULL is returned. | ||
32 | * if bufsize is < 0 char *buffer can be set to NULL. | ||
33 | * If idname exists a pointer to it is returned, | ||
34 | * else an error message is printed and the program exits. | ||
35 | */ | ||
36 | |||
37 | #include <stdio.h> | ||
38 | #include <assert.h> | ||
39 | #include "libbb.h" | ||
40 | |||
41 | |||
42 | /* internal function for my_getpwuid and my_getgrgid */ | ||
43 | char * my_getug(char *buffer, char *idname, long id, int bufsize, char prefix) | ||
44 | { | ||
45 | if(bufsize > 0 ) { | ||
46 | assert(buffer!=NULL); | ||
47 | if(idname) { | ||
48 | return safe_strncpy(buffer, idname, bufsize); | ||
49 | } | ||
50 | snprintf(buffer, bufsize, "%ld", id); | ||
51 | } else if(bufsize < 0 && !idname) { | ||
52 | bb_error_msg_and_die("unknown %cid %ld", prefix, id); | ||
53 | } | ||
54 | return idname; | ||
55 | } | ||
56 | |||
57 | /* END CODE */ | ||
58 | /* | ||
59 | Local Variables: | ||
60 | c-file-style: "linux" | ||
61 | c-basic-offset: 4 | ||
62 | tab-width: 4 | ||
63 | End: | ||
64 | */ | ||