emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unneeded #includes, fix indentation

Browse Source
This commit is contained in:
Denis Vlasenko
2006-09-23 16:01:09 +00:00
parent c1876d7364
commit c290563319
3 changed files with 47 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
coreutils/printf.c
View File

@@ -38,37 +38,30 @@
// 19990508 Busy Boxed! Dave Cinege // 19990508 Busy Boxed! Dave Cinege
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <fcntl.h>
#include <ctype.h>
#include <assert.h>
#include "busybox.h" #include "busybox.h"
static int print_formatted (char *format, int argc, char **argv); static int print_formatted(char *format, int argc, char **argv);
static void print_direc (char *start, size_t length, static void print_direc(char *start, size_t length,
int field_width, int precision, char *argument); int field_width, int precision, char *argument);
typedef int (*converter)(char *arg, void *result); typedef int (*converter)(char *arg, void *result);
static void multiconvert(char *arg, void *result, converter convert) static void multiconvert(char *arg, void *result, converter convert)
{ {
char s[16]; char s[16];
if (*arg == '"' || *arg == '\'') { if (*arg == '"' || *arg == '\'') {
sprintf(s,"%d",(unsigned)*(++arg)); sprintf(s, "%d", (unsigned)arg[1]);
arg=s; arg = s;
} }
if(convert(arg,result)) fprintf(stderr, "%s", arg); if (convert(arg, result))
fputs(arg, stderr);
} }
static unsigned long xstrtoul(char *arg) static unsigned long xstrtoul(char *arg)
{ {
unsigned long result; unsigned long result;
multiconvert(arg,&result, (converter)safe_strtoul); multiconvert(arg, &result, (converter)safe_strtoul);
return result; return result;
} }
@@ -104,7 +97,7 @@ int printf_main(int argc, char **argv)
char *format; char *format;
int args_used; int args_used;
if (argc <= 1 || **(argv + 1) == '-') { if (argc <= 1 || argv[1][0] == '-') {
bb_show_usage(); bb_show_usage();
} }
@@ -119,9 +112,8 @@ int printf_main(int argc, char **argv)
} }
while (args_used > 0 && argc > 0); while (args_used > 0 && argc > 0);
/* /* if (argc > 0)
if (argc > 0) fprintf(stderr, "excess args ignored");
fprintf(stderr, "excess args ignored");
*/ */
return EXIT_SUCCESS; return EXIT_SUCCESS;
@@ -199,9 +191,9 @@ static int print_formatted(char *format, int argc, char **argv)
++direc_length; ++direc_length;
} }
/* /*
if (!strchr ("diouxXfeEgGcs", *f)) if (!strchr ("diouxXfeEgGcs", *f))
fprintf(stderr, "%%%c: invalid directive", *f); fprintf(stderr, "%%%c: invalid directive", *f);
*/ */
++direc_length; ++direc_length;
if (argc > 0) { if (argc > 0) {
print_direc(direc_start, direc_length, field_width, print_direc(direc_start, direc_length, field_width,
@@ -232,7 +224,7 @@ static void
print_direc(char *start, size_t length, int field_width, int precision, print_direc(char *start, size_t length, int field_width, int precision,
char *argument) char *argument)
{ {
char *p; /* Null-terminated copy of % directive. */ char *p; /* Null-terminated copy of % directive. */
p = xmalloc((unsigned) (length + 1)); p = xmalloc((unsigned) (length + 1));
strncpy(p, start, length); strncpy(p, start, length);

39
libbb/xgetcwd.c
View File

@@ -7,11 +7,6 @@
* Special function for busybox written by Vladimir Oleynik <dzo@simtreas.ru> * Special function for busybox written by Vladimir Oleynik <dzo@simtreas.ru>
*/ */
#include <stdlib.h>
#include <errno.h>
#include <unistd.h>
#include <limits.h>
#include <sys/param.h>
#include "libbb.h" #include "libbb.h"
/* Amount to increase buffer size by in each try. */ /* Amount to increase buffer size by in each try. */
@@ -23,27 +18,27 @@
*/ */
char * char *
xgetcwd (char *cwd) xgetcwd(char *cwd)
{ {
char *ret; char *ret;
unsigned path_max; unsigned path_max;
path_max = (unsigned) PATH_MAX; path_max = (unsigned) PATH_MAX;
path_max += 2; /* The getcwd docs say to do this. */ path_max += 2; /* The getcwd docs say to do this. */
if(cwd==0) if (cwd==0)
cwd = xmalloc (path_max); cwd = xmalloc(path_max);
while ((ret = getcwd (cwd, path_max)) == NULL && errno == ERANGE) { while ((ret = getcwd(cwd, path_max)) == NULL && errno == ERANGE) {
path_max += PATH_INCR; path_max += PATH_INCR;
cwd = xrealloc (cwd, path_max); cwd = xrealloc(cwd, path_max);
} }
if (ret == NULL) { if (ret == NULL) {
free (cwd); free(cwd);
bb_perror_msg("getcwd()"); bb_perror_msg("getcwd");
return NULL; return NULL;
} }
return cwd; return cwd;
} }

31
miscutils/runlevel.c
View File

@@ -20,24 +20,23 @@
int runlevel_main(int argc, char *argv[]) int runlevel_main(int argc, char *argv[])
{ {
struct utmp *ut; struct utmp *ut;
char prev; char prev;
if (argc > 1) utmpname(argv[1]); if (argc > 1) utmpname(argv[1]);
setutent(); setutent();
while ((ut = getutent()) != NULL) { while ((ut = getutent()) != NULL) {
if (ut->ut_type == RUN_LVL) { if (ut->ut_type == RUN_LVL) {
prev = ut->ut_pid / 256; prev = ut->ut_pid / 256;
if (prev == 0) prev = 'N'; if (prev == 0) prev = 'N';
printf("%c %c\n", prev, ut->ut_pid % 256); printf("%c %c\n", prev, ut->ut_pid % 256);
endutent(); endutent();
return (0); return 0;
}
} }
}
printf("unknown\n"); puts("unknown");
endutent(); endutent();
return (1); return 1;
} }