aboutsummaryrefslogtreecommitdiff
path: root/init
diff options
context:
space:
mode:
authorlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-16 08:14:35 +0000
committerlandley <landley@69ca8d6d-28ef-0310-b511-8ec308f3f277>2006-07-16 08:14:35 +0000
commita15cdc358e5f9d1cb517e2b2e490ac209b0dfa17 (patch)
treefac906b4fa40a68c53cecf20215a7a25b3b1cab6 /init
parenta4b7afd4143063613cf88fb5304803e424f5c72a (diff)
downloadbusybox-w32-a15cdc358e5f9d1cb517e2b2e490ac209b0dfa17.tar.gz
busybox-w32-a15cdc358e5f9d1cb517e2b2e490ac209b0dfa17.tar.bz2
busybox-w32-a15cdc358e5f9d1cb517e2b2e490ac209b0dfa17.zip
Cleaup read() and write() variants, plus a couple of new functions like
xlseek and fdlength() for the new mkswap. git-svn-id: svn://busybox.net/trunk/busybox@15703 69ca8d6d-28ef-0310-b511-8ec308f3f277
Diffstat (limited to 'init')
-rw-r--r--init/init.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/init/init.c b/init/init.c
index c9200bd6c..cad64f63a 100644
--- a/init/init.c
+++ b/init/init.c
@@ -221,7 +221,7 @@ static void message(int device, const char *fmt, ...)
221 } 221 }
222 } 222 }
223 if ((device & LOG) && (log_fd >= 0)) { 223 if ((device & LOG) && (log_fd >= 0)) {
224 bb_full_write(log_fd, msg, l); 224 full_write(log_fd, msg, l);
225 } 225 }
226#endif 226#endif
227 227
@@ -230,7 +230,7 @@ static void message(int device, const char *fmt, ...)
230 O_WRONLY | O_NOCTTY | O_NONBLOCK); 230 O_WRONLY | O_NOCTTY | O_NONBLOCK);
231 /* Always send console messages to /dev/console so people will see them. */ 231 /* Always send console messages to /dev/console so people will see them. */
232 if (fd >= 0) { 232 if (fd >= 0) {
233 bb_full_write(fd, msg, l); 233 full_write(fd, msg, l);
234 close(fd); 234 close(fd);
235#if ENABLE_DEBUG_INIT 235#if ENABLE_DEBUG_INIT
236 /* all descriptors may be closed */ 236 /* all descriptors may be closed */
@@ -536,7 +536,7 @@ static pid_t run(const struct init_action *a)
536 messageD(LOG, "Waiting for enter to start '%s'" 536 messageD(LOG, "Waiting for enter to start '%s'"
537 "(pid %d, terminal %s)\n", 537 "(pid %d, terminal %s)\n",
538 cmdpath, getpid(), a->terminal); 538 cmdpath, getpid(), a->terminal);
539 bb_full_write(1, press_enter, sizeof(press_enter) - 1); 539 full_write(1, press_enter, sizeof(press_enter) - 1);
540 while(read(0, &c, 1) == 1 && c != '\n') 540 while(read(0, &c, 1) == 1 && c != '\n')
541 ; 541 ;
542 } 542 }