diff options
author | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-26 23:21:47 +0000 |
---|---|---|
committer | vda <vda@69ca8d6d-28ef-0310-b511-8ec308f3f277> | 2006-10-26 23:21:47 +0000 |
commit | 6dc3a21627db11fa0f374afe29a6bbf4f89c8b64 (patch) | |
tree | 79166b700c497fbe798b6031e5bbff97e0933573 /coreutils/id.c | |
parent | 076d919b597733c0adf653d0ad10073be4adec7f (diff) | |
download | busybox-w32-6dc3a21627db11fa0f374afe29a6bbf4f89c8b64.tar.gz busybox-w32-6dc3a21627db11fa0f374afe29a6bbf4f89c8b64.tar.bz2 busybox-w32-6dc3a21627db11fa0f374afe29a6bbf4f89c8b64.zip |
remove bb_printf and the like
git-svn-id: svn://busybox.net/trunk/busybox@16446 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'coreutils/id.c')
-rw-r--r-- | coreutils/id.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/coreutils/id.c b/coreutils/id.c index 9d605325c..66874a71e 100644 --- a/coreutils/id.c +++ b/coreutils/id.c | |||
@@ -35,7 +35,7 @@ static short printf_full(unsigned int id, const char *arg, const char prefix) | |||
35 | fmt = "%cid=%u(%s)"; | 35 | fmt = "%cid=%u(%s)"; |
36 | status = EXIT_SUCCESS; | 36 | status = EXIT_SUCCESS; |
37 | } | 37 | } |
38 | bb_printf(fmt, prefix, id, arg); | 38 | printf(fmt, prefix, id, arg); |
39 | return status; | 39 | return status; |
40 | } | 40 | } |
41 | 41 | ||
@@ -74,10 +74,10 @@ int id_main(int argc, char **argv) | |||
74 | /* bb_getpwuid and bb_getgrgid exit on failure so puts cannot segfault */ | 74 | /* bb_getpwuid and bb_getgrgid exit on failure so puts cannot segfault */ |
75 | puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 )); | 75 | puts((flags & JUST_USER) ? bb_getpwuid(NULL, uid, -1 ) : bb_getgrgid(NULL, gid, -1 )); |
76 | } else { | 76 | } else { |
77 | bb_printf("%u\n", (flags & JUST_USER) ? uid : gid); | 77 | printf("%u\n", (flags & JUST_USER) ? uid : gid); |
78 | } | 78 | } |
79 | /* exit */ | 79 | /* exit */ |
80 | bb_fflush_stdout_and_exit(EXIT_SUCCESS); | 80 | fflush_stdout_and_exit(EXIT_SUCCESS); |
81 | } | 81 | } |
82 | 82 | ||
83 | /* Print full info like GNU id */ | 83 | /* Print full info like GNU id */ |
@@ -96,16 +96,16 @@ int id_main(int argc, char **argv) | |||
96 | getcon(&mysid); | 96 | getcon(&mysid); |
97 | context[0] = '\0'; | 97 | context[0] = '\0'; |
98 | if (mysid) { | 98 | if (mysid) { |
99 | len = strlen(mysid)+1; | 99 | len = strlen(mysid)+1; |
100 | safe_strncpy(context, mysid, len); | 100 | safe_strncpy(context, mysid, len); |
101 | freecon(mysid); | 101 | freecon(mysid); |
102 | } else { | 102 | } else { |
103 | safe_strncpy(context, "unknown", 8); | 103 | safe_strncpy(context, "unknown", 8); |
104 | } | 104 | } |
105 | bb_printf(" context=%s", context); | 105 | printf(" context=%s", context); |
106 | } | 106 | } |
107 | #endif | 107 | #endif |
108 | 108 | ||
109 | putchar('\n'); | 109 | putchar('\n'); |
110 | bb_fflush_stdout_and_exit(status); | 110 | fflush_stdout_and_exit(status); |
111 | } | 111 | } |