Magellan Linux

  • Back to homepage
    • /[magellan-source]/trunk/mkinitrd-magellan/busybox/debianutils/start_stop_daemon.c

    Diff of /trunk/mkinitrd-magellan/busybox/debianutils/start_stop_daemon.c

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

    revision 983 by niro, Fri Apr 24 18:33:46 2009 UTC revision 984 by niro, Sun May 30 11:32:42 2010 UTC
    # Line 347  int start_stop_daemon_main(int argc UNUS Line 347  int start_stop_daemon_main(int argc UNUS
    347   /* -xa (at least one) is required if -S is given */   /* -xa (at least one) is required if -S is given */
    348   /* -q turns off -v */   /* -q turns off -v */
    349   opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa"   opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa"
    350   USE_FEATURE_START_STOP_DAEMON_FANCY("q-v");   IF_FEATURE_START_STOP_DAEMON_FANCY("q-v");
    351   opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:"   opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:"
    352   USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),   IF_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
    353   &startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile   &startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile
    354   USE_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)   IF_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
    355   /* We accept and ignore -R <param> / --retry <param> */   /* We accept and ignore -R <param> / --retry <param> */
    356   USE_FEATURE_START_STOP_DAEMON_FANCY(,NULL)   IF_FEATURE_START_STOP_DAEMON_FANCY(,NULL)
    357   );   );
    358    
    359   if (opt & OPT_s) {   if (opt & OPT_s) {
    # Line 366  int start_stop_daemon_main(int argc UNUS Line 366  int start_stop_daemon_main(int argc UNUS
    366   if (!execname) /* in case -a is given and -x is not */   if (!execname) /* in case -a is given and -x is not */
    367   execname = startas;   execname = startas;
    368    
    369  // USE_FEATURE_START_STOP_DAEMON_FANCY(  // IF_FEATURE_START_STOP_DAEMON_FANCY(
    370  // if (retry_arg)  // if (retry_arg)
    371  // retries = xatoi_u(retry_arg);  // retries = xatoi_u(retry_arg);
    372  // )  // )
    # Line 443  int start_stop_daemon_main(int argc UNUS Line 443  int start_stop_daemon_main(int argc UNUS
    443   }   }
    444  #endif  #endif
    445   execvp(startas, argv);   execvp(startas, argv);
    446   bb_perror_msg_and_die("cannot start %s", startas);   bb_perror_msg_and_die("can't start %s", startas);
    447  }  }
    Legend:
    Removed from v.983  
    changed lines
      Added in v.984