aboutsummaryrefslogtreecommitdiff
path: root/coreutils/id.c
diff options
context:
space:
mode:
Diffstat (limited to 'coreutils/id.c')
-rw-r--r--coreutils/id.c16
1 files changed, 8 insertions, 8 deletions
diff --git a/coreutils/id.c b/coreutils/id.c
index 03c6a6d2a..28050ddf2 100644
--- a/coreutils/id.c
+++ b/coreutils/id.c
@@ -80,8 +80,8 @@ extern int id_main(int argc, char **argv)
80 80
81 if(argv[optind]) { 81 if(argv[optind]) {
82 p=getpwnam(argv[optind]); 82 p=getpwnam(argv[optind]);
83 /* my_getpwnam is needed because it exits on failure */ 83 /* bb_xgetpwnam is needed because it exits on failure */
84 uid = my_getpwnam(argv[optind]); 84 uid = bb_xgetpwnam(argv[optind]);
85 gid = p->pw_gid; 85 gid = p->pw_gid;
86 /* in this case PRINT_REAL is the same */ 86 /* in this case PRINT_REAL is the same */
87 } 87 }
@@ -89,8 +89,8 @@ extern int id_main(int argc, char **argv)
89 if(flags & (JUST_GROUP | JUST_USER)) { 89 if(flags & (JUST_GROUP | JUST_USER)) {
90 /* JUST_GROUP and JUST_USER are mutually exclusive */ 90 /* JUST_GROUP and JUST_USER are mutually exclusive */
91 if(flags & NAME_NOT_NUMBER) { 91 if(flags & NAME_NOT_NUMBER) {
92 /* my_getpwuid and my_getgrgid exit on failure so puts cannot segfault */ 92 /* bb_getpwuid and bb_getgrgid exit on failure so puts cannot segfault */
93 puts((flags & JUST_USER) ? my_getpwuid(NULL, uid, -1 ) : my_getgrgid(NULL, gid, -1 )); 93 puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 ));
94 } else { 94 } else {
95 bb_printf("%u\n",(flags & JUST_USER) ? uid : gid); 95 bb_printf("%u\n",(flags & JUST_USER) ? uid : gid);
96 } 96 }
@@ -99,11 +99,11 @@ extern int id_main(int argc, char **argv)
99 } 99 }
100 100
101 /* Print full info like GNU id */ 101 /* Print full info like GNU id */
102 /* my_getpwuid doesn't exit on failure here */ 102 /* bb_getpwuid doesn't exit on failure here */
103 status=printf_full(uid, my_getpwuid(NULL, uid, 0), 'u'); 103 status=printf_full(uid, bb_getpwuid(NULL, uid, 0), 'u');
104 putchar(' '); 104 putchar(' ');
105 /* my_getgrgid doesn't exit on failure here */ 105 /* bb_getgrgid doesn't exit on failure here */
106 status|=printf_full(gid, my_getgrgid(NULL, gid, 0), 'g'); 106 status|=printf_full(gid, bb_getgrgid(NULL, gid, 0), 'g');
107 107
108#ifdef CONFIG_SELINUX 108#ifdef CONFIG_SELINUX
109 if ( is_selinux_enabled() ) { 109 if ( is_selinux_enabled() ) {