Simplify some conditionals.
This commit is contained in:
parent
1951291f8f
commit
fa8e7cc207
@ -58,15 +58,15 @@ main(int argc, char **argv)
|
|||||||
char *fname, *rname;
|
char *fname, *rname;
|
||||||
|
|
||||||
rsize = tsize = 0;
|
rsize = tsize = 0;
|
||||||
rname = NULL;
|
|
||||||
error = 0;
|
error = 0;
|
||||||
|
rname = NULL;
|
||||||
while ((ch = getopt(argc, argv, "cr:s:")) != -1)
|
while ((ch = getopt(argc, argv, "cr:s:")) != -1)
|
||||||
switch (ch) {
|
switch (ch) {
|
||||||
case 'c':
|
case 'c':
|
||||||
no_create++;
|
no_create = 1;
|
||||||
break;
|
break;
|
||||||
case 'r':
|
case 'r':
|
||||||
do_refer++;
|
do_refer = 1;
|
||||||
rname = optarg;
|
rname = optarg;
|
||||||
break;
|
break;
|
||||||
case 's':
|
case 's':
|
||||||
@ -74,8 +74,8 @@ main(int argc, char **argv)
|
|||||||
errx(EXIT_FAILURE,
|
errx(EXIT_FAILURE,
|
||||||
"invalid size argument `%s'", optarg);
|
"invalid size argument `%s'", optarg);
|
||||||
if (*optarg == '+' || *optarg == '-')
|
if (*optarg == '+' || *optarg == '-')
|
||||||
do_relative++;
|
do_relative = 1;
|
||||||
got_size++;
|
got_size = 1;
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
usage();
|
usage();
|
||||||
@ -90,18 +90,16 @@ main(int argc, char **argv)
|
|||||||
* do_relative implies got_size, do_relative and do_refer are
|
* do_relative implies got_size, do_relative and do_refer are
|
||||||
* also mutually exclusive. See usage() for allowed invocations.
|
* also mutually exclusive. See usage() for allowed invocations.
|
||||||
*/
|
*/
|
||||||
if (!(do_refer || got_size) || (do_refer && got_size) || argc < 1)
|
if (do_refer + got_size != 1 || argc < 1)
|
||||||
usage();
|
usage();
|
||||||
if (do_refer) {
|
if (do_refer) {
|
||||||
if (stat(rname, &sb) == -1)
|
if (stat(rname, &sb) == -1)
|
||||||
err(EXIT_FAILURE, "%s", rname);
|
err(EXIT_FAILURE, "%s", rname);
|
||||||
tsize = sb.st_size;
|
tsize = sb.st_size;
|
||||||
} else if (got_size) {
|
} else if (do_relative)
|
||||||
if (do_relative)
|
|
||||||
rsize = sz;
|
rsize = sz;
|
||||||
else
|
else
|
||||||
tsize = sz;
|
tsize = sz;
|
||||||
}
|
|
||||||
|
|
||||||
if (no_create)
|
if (no_create)
|
||||||
oflags = O_WRONLY;
|
oflags = O_WRONLY;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user