diff options
author | Damien Miller <djm@mindrot.org> | 2008-06-29 22:45:13 +1000 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2008-06-29 22:45:13 +1000 |
commit | f184bcf89e0925921583f857858871fdf81ce337 (patch) | |
tree | 14acd85b218943abd8cf87f5d3aab6ca1206b1e4 /sftp.c | |
parent | 493f0324402bc489ba150b0e4c6c8a9f9146cac1 (diff) |
- (djm) OpenBSD CVS Sync
- martynas@cvs.openbsd.org 2008/06/21 07:46:46
[sftp.c]
use optopt to get invalid flag, instead of return value of getopt,
which is always '?'; ok djm@
Diffstat (limited to 'sftp.c')
-rw-r--r-- | sftp.c | 14 |
1 files changed, 7 insertions, 7 deletions
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: sftp.c,v 1.101 2008/06/08 20:15:29 dtucker Exp $ */ | 1 | /* $OpenBSD: sftp.c,v 1.102 2008/06/21 07:46:46 martynas Exp $ */ |
2 | /* | 2 | /* |
3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> | 3 | * Copyright (c) 2001-2004 Damien Miller <djm@openbsd.org> |
4 | * | 4 | * |
@@ -364,7 +364,7 @@ infer_path(const char *p, char **ifp) | |||
364 | static int | 364 | static int |
365 | parse_getput_flags(const char *cmd, char **argv, int argc, int *pflag) | 365 | parse_getput_flags(const char *cmd, char **argv, int argc, int *pflag) |
366 | { | 366 | { |
367 | extern int optind, optreset, opterr; | 367 | extern int opterr, optind, optopt, optreset; |
368 | int ch; | 368 | int ch; |
369 | 369 | ||
370 | optind = optreset = 1; | 370 | optind = optreset = 1; |
@@ -378,7 +378,7 @@ parse_getput_flags(const char *cmd, char **argv, int argc, int *pflag) | |||
378 | *pflag = 1; | 378 | *pflag = 1; |
379 | break; | 379 | break; |
380 | default: | 380 | default: |
381 | error("%s: Invalid flag -%c", cmd, ch); | 381 | error("%s: Invalid flag -%c", cmd, optopt); |
382 | return -1; | 382 | return -1; |
383 | } | 383 | } |
384 | } | 384 | } |
@@ -389,7 +389,7 @@ parse_getput_flags(const char *cmd, char **argv, int argc, int *pflag) | |||
389 | static int | 389 | static int |
390 | parse_ls_flags(char **argv, int argc, int *lflag) | 390 | parse_ls_flags(char **argv, int argc, int *lflag) |
391 | { | 391 | { |
392 | extern int optind, optreset, opterr; | 392 | extern int opterr, optind, optopt, optreset; |
393 | int ch; | 393 | int ch; |
394 | 394 | ||
395 | optind = optreset = 1; | 395 | optind = optreset = 1; |
@@ -428,7 +428,7 @@ parse_ls_flags(char **argv, int argc, int *lflag) | |||
428 | *lflag |= LS_TIME_SORT; | 428 | *lflag |= LS_TIME_SORT; |
429 | break; | 429 | break; |
430 | default: | 430 | default: |
431 | error("ls: Invalid flag -%c", ch); | 431 | error("ls: Invalid flag -%c", optopt); |
432 | return -1; | 432 | return -1; |
433 | } | 433 | } |
434 | } | 434 | } |
@@ -439,7 +439,7 @@ parse_ls_flags(char **argv, int argc, int *lflag) | |||
439 | static int | 439 | static int |
440 | parse_df_flags(const char *cmd, char **argv, int argc, int *hflag, int *iflag) | 440 | parse_df_flags(const char *cmd, char **argv, int argc, int *hflag, int *iflag) |
441 | { | 441 | { |
442 | extern int optind, optreset, opterr; | 442 | extern int opterr, optind, optopt, optreset; |
443 | int ch; | 443 | int ch; |
444 | 444 | ||
445 | optind = optreset = 1; | 445 | optind = optreset = 1; |
@@ -455,7 +455,7 @@ parse_df_flags(const char *cmd, char **argv, int argc, int *hflag, int *iflag) | |||
455 | *iflag = 1; | 455 | *iflag = 1; |
456 | break; | 456 | break; |
457 | default: | 457 | default: |
458 | error("%s: Invalid flag -%c", cmd, ch); | 458 | error("%s: Invalid flag -%c", cmd, optopt); |
459 | return -1; | 459 | return -1; |
460 | } | 460 | } |
461 | } | 461 | } |