sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

stdio: Replace FILE functions with filedescriptor functions 

We have defined stdin, stdout and stderr as integer file descriptors,
but normally they should be FILE *. Also fprintf, fputc and fputs take
file descriptors instead of FILE *. As FILE * are inconvenient in the
barebox environment replace the f* functions with the corresponding d*
functions. dprintf is POSIX conform whereas dputc and dputs are barebox
specific, but do not conflict with any stdc function. fgetc is unused
and can be removed without replacing it.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Sascha Hauer 2016-04-14 09:37:28 +02:00
parent 473d6f8a7a
commit 5559bfd271
5 changed files with 24 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
commands/echo.c
View File

@ -27,7 +27,7 @@
static int do_echo(int argc, char *argv[])
{
int i, optind = 1;
int fd = stdout, opt, newline = 1;
int fd = STDOUT_FILENO, opt, newline = 1;
char *file = NULL;
int oflags = O_WRONLY | O_CREAT;
char str[CONFIG_CBSIZE];
@ -81,17 +81,17 @@ exit_parse:
for (i = optind; i < argc; i++) {
if (i > optind)
fputc(fd, ' ');
dputc(fd, ' ');
if (process_escape) {
process_escape_sequence(argv[i], str, CONFIG_CBSIZE);
fputs(fd, str);
dputs(fd, str);
} else {
fputs(fd, argv[i]);
dputs(fd, argv[i]);
}
}
if (newline)
fputc(fd, '\n');
dputc(fd, '\n');
if (file)
close(fd);

10
common/console.c
View File

@ -382,16 +382,6 @@ int getchar(void)
}
EXPORT_SYMBOL(getchar);
int fgetc(int fd)
{
char c;
if (!fd)
return getchar();
return read(fd, &c, 1);
}
EXPORT_SYMBOL(fgetc);
int tstc(void)
{
return kfifo_len(console_input_fifo) || tstc_raw();

18
common/console_common.c
View File

@ -278,7 +278,7 @@ EXPORT_SYMBOL(console_get_first_active);
#endif /* !CONFIG_CONSOLE_NONE */
int fprintf(int file, const char *fmt, ...)
int dprintf(int file, const char *fmt, ...)
{
va_list args;
char printbuffer[CFG_PBSIZE];
@ -293,30 +293,30 @@ int fprintf(int file, const char *fmt, ...)
va_end(args);
/* Print the string */
return fputs(file, printbuffer);
return dputs(file, printbuffer);
}
EXPORT_SYMBOL(fprintf);
EXPORT_SYMBOL(dprintf);
int fputs(int fd, const char *s)
int dputs(int fd, const char *s)
{
if (fd == 1)
return puts(s);
else if (fd == 2)
return eputs(s);
return console_puts(CONSOLE_STDERR, s);
else
return write(fd, s, strlen(s));
}
EXPORT_SYMBOL(fputs);
EXPORT_SYMBOL(dputs);
int fputc(int fd, char c)
int dputc(int fd, char c)
{
if (fd == 1)
putchar(c);
else if (fd == 2)
eputc(c);
console_putc(CONSOLE_STDERR, c);
else
return write(fd, &c, 1);
return 0;
}
EXPORT_SYMBOL(fputc);
EXPORT_SYMBOL(dputc);

2
common/globalvar.c
View File

@ -51,7 +51,7 @@ static int nv_save(const char *name, const char *val)
if (fd < 0)
return fd;
fprintf(fd, "%s", val);
dprintf(fd, "%s", val);
close(fd);

21
include/stdio.h
View File

@ -89,23 +89,20 @@ static inline void putchar(char c)
console_putc(CONSOLE_STDOUT, c);
}
/* stderr */
#define eputc(c) console_putc(CONSOLE_STDERR, c)
#define eputs(s) console_puts(CONSOLE_STDERR, s)
#define eprintf(fmt,args...) fprintf(stderr,fmt ,##args)
/*
* FILE based functions
*/
#define stdin 0
#define stdout 1
#define stderr 2
/* stderr */
#define eprintf(fmt,args...) dprintf(STDERR_FILENO, fmt ,##args)
#define STDIN_FILENO 0
#define STDOUT_FILENO 1
#define STDERR_FILENO 2
#define MAX_FILES 128
int fprintf(int file, const char *fmt, ...) __attribute__ ((format(__printf__, 2, 3)));
int fputs(int file, const char *s);
int fputc(int file, const char c);
int fgetc(int file);
int dprintf(int file, const char *fmt, ...) __attribute__ ((format(__printf__, 2, 3)));
int dputs(int file, const char *s);
int dputc(int file, const char c);
#endif /* __STDIO_H */