Magellan Linux

Diff of /trunk/mkinitrd-magellan/busybox/networking/inetd.c

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 984 by niro, Sun May 30 11:32:42 2010 UTC revision 1123 by niro, Wed Aug 18 21:56:57 2010 UTC
# Line 313  struct globals { Line 313  struct globals {
313   fd_set allsock;   fd_set allsock;
314   /* Used in next_line(), and as scratch read buffer */   /* Used in next_line(), and as scratch read buffer */
315   char line[256];          /* _at least_ 256, see LINE_SIZE */   char line[256];          /* _at least_ 256, see LINE_SIZE */
316  };  } FIX_ALIASING;
317  #define G (*(struct globals*)&bb_common_bufsiz1)  #define G (*(struct globals*)&bb_common_bufsiz1)
318  enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) };  enum { LINE_SIZE = COMMON_BUFSIZE - offsetof(struct globals, line) };
319  struct BUG_G_too_big {  struct BUG_G_too_big {
# Line 1271  int inetd_main(int argc UNUSED_PARAM, ch Line 1271  int inetd_main(int argc UNUSED_PARAM, ch
1271   pid = vfork();   pid = vfork();
1272    
1273   if (pid < 0) { /* fork error */   if (pid < 0) { /* fork error */
1274   bb_perror_msg("fork");   bb_perror_msg("vfork"+1);
1275   sleep(1);   sleep(1);
1276   restore_sigmask(&omask);   restore_sigmask(&omask);
1277   maybe_close(accepted_fd);   maybe_close(accepted_fd);
# Line 1380  int inetd_main(int argc UNUSED_PARAM, ch Line 1380  int inetd_main(int argc UNUSED_PARAM, ch
1380   sigaction_set(SIGPIPE, &saved_pipe_handler);   sigaction_set(SIGPIPE, &saved_pipe_handler);
1381   restore_sigmask(&omask);   restore_sigmask(&omask);
1382   BB_EXECVP(sep->se_program, sep->se_argv);   BB_EXECVP(sep->se_program, sep->se_argv);
1383   bb_perror_msg("exec %s", sep->se_program);   bb_perror_msg("can't execute '%s'", sep->se_program);
1384   do_exit1:   do_exit1:
1385   /* eat packet in udp case */   /* eat packet in udp case */
1386   if (sep->se_socktype != SOCK_STREAM)   if (sep->se_socktype != SOCK_STREAM)

Legend:
Removed from v.984  
changed lines
  Added in v.1123