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

device_open is common code -- moved into utility.c

Browse Source 
-Erik
This commit is contained in:
Erik Andersen 2000-02-07 20:31:19 +00:00
parent 79ac30da83
commit 31cf8e0056
6 changed files with 25 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
init.c
View File

@ -115,25 +115,6 @@ static char termType[32] = "TERM=ansi";
static char console[32] = _PATH_CONSOLE;
/* try to open up the specified device */
int device_open(char *device, int mode)
{
int m, f, fd = -1;
m = mode | O_NONBLOCK;
/* Retry up to 5 times */
for (f = 0; f < 5; f++)
if ((fd = open(device, m, 0600)) >= 0)
break;
if (fd < 0)
return fd;
/* Reset original flags. */
if (m != mode)
fcntl(fd, F_SETFL, mode);
return fd;
}
/* print a message to the specified device:
* device may be bitwise-or'd from LOG | CONSOLE */
void message(int device, char *fmt, ...)

19
init/init.c
View File

@ -115,25 +115,6 @@ static char termType[32] = "TERM=ansi";
static char console[32] = _PATH_CONSOLE;
/* try to open up the specified device */
int device_open(char *device, int mode)
{
int m, f, fd = -1;
m = mode | O_NONBLOCK;
/* Retry up to 5 times */
for (f = 0; f < 5; f++)
if ((fd = open(device, m, 0600)) >= 0)
break;
if (fd < 0)
return fd;
/* Reset original flags. */
if (m != mode)
fcntl(fd, F_SETFL, mode);
return fd;
}
/* print a message to the specified device:
* device may be bitwise-or'd from LOG | CONSOLE */
void message(int device, char *fmt, ...)

3
internal.h
View File

@ -183,6 +183,9 @@ extern char *mtab_getinfo(const char *match, const char which);
extern int check_wildcard_match(const char* text, const char* pattern);
extern long getNum (const char *cp);
extern pid_t findInitPid();
#if defined BB_INIT || defined BB_SYSLOGD
extern int device_open(char *device, int mode)
#endif
#if defined BB_FEATURE_MOUNT_LOOP
extern int del_loop(const char *device);

19
sysklogd/syslogd.c
View File

@ -68,25 +68,6 @@ static const char syslogd_usage[] =
"\t-O\tSpecify an alternate log file. default=/var/log/messages\n";
/* try to open up the specified device */
static int device_open(char *device, int mode)
{
int m, f, fd = -1;
m = mode | O_NONBLOCK;
/* Retry up to 5 times */
for (f = 0; f < 5; f++)
if ((fd = open(device, m, 0600)) >= 0)
break;
if (fd < 0)
return fd;
/* Reset original flags. */
if (m != mode)
fcntl(fd, F_SETFL, mode);
return fd;
}
/* print a message to the log file */
static void message(char *fmt, ...)
{

19
syslogd.c
View File

@ -68,25 +68,6 @@ static const char syslogd_usage[] =
"\t-O\tSpecify an alternate log file. default=/var/log/messages\n";
/* try to open up the specified device */
static int device_open(char *device, int mode)
{
int m, f, fd = -1;
m = mode | O_NONBLOCK;
/* Retry up to 5 times */
for (f = 0; f < 5; f++)
if ((fd = open(device, m, 0600)) >= 0)
break;
if (fd < 0)
return fd;
/* Reset original flags. */
if (m != mode)
fcntl(fd, F_SETFL, mode);
return fd;
}
/* print a message to the log file */
static void message(char *fmt, ...)
{

22
utility.c
View File

@ -1121,6 +1121,28 @@ extern long getNum (const char *cp)
#endif /* BB_DD || BB_TAIL */
#if defined BB_INIT || defined BB_SYSLOGD
/* try to open up the specified device */
extern int device_open(char *device, int mode)
{
int m, f, fd = -1;
m = mode | O_NONBLOCK;
/* Retry up to 5 times */
for (f = 0; f < 5; f++)
if ((fd = open(device, m, 0600)) >= 0)
break;
if (fd < 0)
return fd;
/* Reset original flags. */
if (m != mode)
fcntl(fd, F_SETFL, mode);
return fd;
}
#endif /* BB_INIT BB_SYSLOGD */
#if defined BB_INIT || defined BB_HALT || defined BB_REBOOT
#if ! defined BB_FEATURE_USE_PROCFS