- lport = bb_lookup_port(optarg, "tcp", 0);
- else if (ENABLE_NC_EXTRA && opt=='w') wsecs = atoi(optarg);
- else if (ENABLE_NC_EXTRA && opt=='i') delay = atoi(optarg);
- else if (ENABLE_NC_EXTRA && opt=='f') infile = optarg;
- else if (ENABLE_NC_EXTRA && opt=='e' && optind!=argc) {
- execflag++;
- break;
+ USE_NC_SERVER(lport = bb_lookup_port(optarg, "tcp", 0));
+ else if (ENABLE_NC_EXTRA && opt=='w')
+ USE_NC_EXTRA( wsecs = xatou(optarg));
+ else if (ENABLE_NC_EXTRA && opt=='i')
+ USE_NC_EXTRA( delay = xatou(optarg));
+ else if (ENABLE_NC_EXTRA && opt=='f')
+ USE_NC_EXTRA( cfd = xopen(optarg, O_RDWR));
+ else if (ENABLE_NC_EXTRA && opt=='e' && optind <= argc) {
+ /* We cannot just 'break'. We should let getopt finish.
+ ** Or else we won't be able to find where
+ ** 'host' and 'port' params are
+ ** (think "nc -w 60 host port -e prog"). */
+ USE_NC_EXTRA(
+ char **p;
+ // +2: one for progname (optarg) and one for NULL
+ execparam = xzalloc(sizeof(char*) * (argc - optind + 2));
+ p = execparam;
+ *p++ = optarg;
+ while (optind < argc) {
+ *p++ = argv[optind++];
+ }
+ )
+ /* optind points to argv[arvc] (NULL) now.
+ ** FIXME: we assume that getopt will not count options
+ ** possibly present on "-e prog args" and will not
+ ** include them into final value of optind
+ ** which is to be used ... */