projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update contact info.
[oweals/busybox.git]
/
printf.c
diff --git
a/printf.c
b/printf.c
index 28a011dcd9236ce598068e65403dfaf5b07b1d3e..72bc7ae89e65eab41dc5be9149d11d1beb567037 100644
(file)
--- a/
printf.c
+++ b/
printf.c
@@
-47,22
+47,19
@@
// 19990508 Busy Boxed! Dave Cinege
// 19990508 Busy Boxed! Dave Cinege
-#include "
internal
.h"
+#include "
busybox
.h"
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
#include <unistd.h>
#include <stdio.h>
#include <sys/types.h>
-#include <getopt.h>
-#include <sys/stat.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <fcntl.h>
#include <ctype.h>
#include <string.h>
#include <errno.h>
#include <stdlib.h>
#include <fcntl.h>
#include <ctype.h>
-#include <libintl.h>
#ifndef S_IFMT
#ifndef S_IFMT
-# define S_IFMT 0170000
+static const int S_IFMT = 0170000;
#endif
#if !defined(S_ISBLK) && defined(S_IFBLK)
# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
#endif
#if !defined(S_ISBLK) && defined(S_IFBLK)
# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
@@
-139,13
+136,6
@@
static void verify __P((char *s, char *end));
/* The value to return to the calling program. */
static int exit_status;
/* The value to return to the calling program. */
static int exit_status;
-static const char printf_usage[] = "printf FORMAT [ARGUMENT...]\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
- "\nFormats and prints ARGUMENT(s) according to FORMAT,\n"
- "Where FORMAT controls the output exactly as in C printf.\n"
-#endif
- ;
-
int printf_main(int argc, char **argv)
{
char *format;
int printf_main(int argc, char **argv)
{
char *format;
@@
-172,7
+162,7
@@
int printf_main(int argc, char **argv)
fprintf(stderr, "excess args ignored");
*/
fprintf(stderr, "excess args ignored");
*/
-
exit
(exit_status);
+
return
(exit_status);
}
/* Print the text in FORMAT, using ARGV (with ARGC elements) for
}
/* Print the text in FORMAT, using ARGV (with ARGC elements) for