85fffbb277
currently the error messages have the shortopt hardcoded in them, even when the user actually entered a longopt: $ ./nsxiv --framerate v nsxiv: Invalid argument for option -A: v and as far as I see, there's no way to *reliably* tell weather we're processing a longopt or a shortopt. perhaps we can do some shenanigangs with `optind` but that seems finicky at best. and it seems like other coreutils which support longopt has similar issues: $ xargs --max-procs=z xargs: invalid number "z" for -P option utils like `grep` and `head` seems to work-around it by not mentioning the flag: $ head --lines=z head: invalid number of lines: ‘z’ $ grep --max-count=l grep: invalid max count this patch does the same thing as `grep/head` and omits the flag from the error message. Closes: https://codeberg.org/nsxiv/nsxiv/issues/368 Reviewed-on: https://codeberg.org/nsxiv/nsxiv/pulls/371 Reviewed-by: Berke Kocaoğlu <berke.kocaoglu@metu.edu.tr>
262 lines
7.6 KiB
C
262 lines
7.6 KiB
C
/* Copyright 2011-2020 Bert Muennich
|
|
* Copyright 2021-2022 nsxiv contributors
|
|
*
|
|
* This file is a part of nsxiv.
|
|
*
|
|
* nsxiv is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published
|
|
* by the Free Software Foundation; either version 2 of the License,
|
|
* or (at your option) any later version.
|
|
*
|
|
* nsxiv is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License
|
|
* along with nsxiv. If not, see <http://www.gnu.org/licenses/>.
|
|
*/
|
|
|
|
#include "nsxiv.h"
|
|
#include "version.h"
|
|
#define INCLUDE_OPTIONS_CONFIG
|
|
#include "config.h"
|
|
|
|
#include <assert.h>
|
|
#include <limits.h>
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
#include <unistd.h>
|
|
|
|
#define OPTPARSE_IMPLEMENTATION
|
|
#define OPTPARSE_API static
|
|
#pragma GCC diagnostic push /* also works on clang */
|
|
#pragma GCC diagnostic ignored "-Wshadow"
|
|
#pragma GCC diagnostic ignored "-Wunused-function"
|
|
#include "optparse.h"
|
|
#pragma GCC diagnostic pop
|
|
|
|
const opt_t *options;
|
|
|
|
void print_usage(void)
|
|
{
|
|
printf("usage: %s [-abcfhiopqrtvZ0] [-A FRAMERATE] [-e WID] [-G GAMMA] "
|
|
"[-g GEOMETRY] [-N NAME] [-n NUM] [-S DELAY] [-s MODE] "
|
|
"[-z ZOOM] FILES...\n", progname);
|
|
}
|
|
|
|
static void title_deprecation_notice(void)
|
|
{
|
|
error(EXIT_FAILURE, 0, "\n"
|
|
"################################################################\n"
|
|
"# DEPRECATION NOTICE #\n"
|
|
"################################################################\n"
|
|
"# `-T` option has been deprecated in favour of `win-title`. #\n"
|
|
"# Please read the `WINDOW TITLE` section of the manpage for #\n"
|
|
"# more info. #\n"
|
|
"################################################################"
|
|
);
|
|
}
|
|
|
|
static void print_version(void)
|
|
{
|
|
printf("%s %s\n", progname, VERSION);
|
|
}
|
|
|
|
void parse_options(int argc, char **argv)
|
|
{
|
|
enum { /* ensure these can't be represented in a single byte */
|
|
OPT_AA = UCHAR_MAX + 1
|
|
};
|
|
static const struct optparse_long longopts[] = {
|
|
{ "framerate", 'A', OPTPARSE_REQUIRED },
|
|
{ "animate", 'a', OPTPARSE_NONE },
|
|
{ "no-bar", 'b', OPTPARSE_NONE },
|
|
{ "clean-cache", 'c', OPTPARSE_NONE },
|
|
{ "embed", 'e', OPTPARSE_REQUIRED },
|
|
{ "fullscreen", 'f', OPTPARSE_NONE },
|
|
{ "gamma", 'G', OPTPARSE_REQUIRED },
|
|
{ "geometry", 'g', OPTPARSE_REQUIRED },
|
|
{ "help", 'h', OPTPARSE_NONE },
|
|
{ "stdin", 'i', OPTPARSE_NONE },
|
|
{ "class", 'N', OPTPARSE_REQUIRED },
|
|
{ "start-at", 'n', OPTPARSE_REQUIRED },
|
|
{ "stdout", 'o', OPTPARSE_NONE },
|
|
{ "private", 'p', OPTPARSE_NONE },
|
|
{ "quiet", 'q', OPTPARSE_NONE },
|
|
{ "recursive", 'r', OPTPARSE_NONE },
|
|
{ "ss-delay", 'S', OPTPARSE_REQUIRED },
|
|
{ "scale-mode", 's', OPTPARSE_REQUIRED },
|
|
{ NULL, 'T', OPTPARSE_REQUIRED },
|
|
{ "thumbnail", 't', OPTPARSE_NONE },
|
|
{ "version", 'v', OPTPARSE_NONE },
|
|
{ "zoom-100", 'Z', OPTPARSE_NONE },
|
|
{ "zoom", 'z', OPTPARSE_REQUIRED },
|
|
{ "null", '0', OPTPARSE_NONE },
|
|
{ "anti-alias", OPT_AA, OPTPARSE_OPTIONAL },
|
|
{ 0 }, /* end */
|
|
};
|
|
|
|
long n, opt;
|
|
float f;
|
|
char *end, *s;
|
|
struct optparse op;
|
|
const char scalemodes[] = "dfFwh"; /* must be sorted according to scalemode_t */
|
|
static opt_t _options;
|
|
|
|
options = &_options;
|
|
_options.from_stdin = false;
|
|
_options.to_stdout = false;
|
|
_options.using_null = false;
|
|
_options.recursive = false;
|
|
_options.startnum = 0;
|
|
|
|
_options.scalemode = SCALE_DOWN;
|
|
_options.zoom = 1.0;
|
|
_options.anti_alias = ANTI_ALIAS;
|
|
_options.animate = false;
|
|
_options.gamma = 0;
|
|
_options.slideshow = 0;
|
|
_options.framerate = 0;
|
|
|
|
_options.fullscreen = false;
|
|
_options.embed = 0;
|
|
_options.hide_bar = false;
|
|
_options.geometry = NULL;
|
|
_options.res_name = NULL;
|
|
|
|
_options.quiet = false;
|
|
_options.thumb_mode = false;
|
|
_options.clean_cache = false;
|
|
_options.private_mode = false;
|
|
|
|
if (argc > 0) {
|
|
s = strrchr(argv[0], '/');
|
|
progname = s != NULL && s[1] != '\0' ? s + 1 : argv[0];
|
|
}
|
|
|
|
optparse_init(&op, argv);
|
|
while ((opt = optparse_long(&op, longopts, NULL)) != -1) {
|
|
for (n = 0; n < (int)ARRLEN(longopts); ++n) { /* clang-tidy finds some non-sensical branch and thinks optarg == NULL is possible */
|
|
if (opt == longopts[n].shortname && longopts[n].argtype == OPTPARSE_REQUIRED)
|
|
assert(op.optarg != NULL);
|
|
}
|
|
switch (opt) {
|
|
case '?':
|
|
fprintf(stderr, "%s\n", op.errmsg);
|
|
print_usage();
|
|
exit(EXIT_FAILURE);
|
|
case 'A':
|
|
n = strtol(op.optarg, &end, 0);
|
|
if (*end != '\0' || n <= 0 || n > INT_MAX)
|
|
error(EXIT_FAILURE, 0, "Invalid framerate: %s", op.optarg);
|
|
_options.framerate = n;
|
|
/* fall through */
|
|
case 'a':
|
|
_options.animate = true;
|
|
break;
|
|
case 'b':
|
|
_options.hide_bar = true;
|
|
break;
|
|
case 'c':
|
|
_options.clean_cache = true;
|
|
break;
|
|
case 'e':
|
|
n = strtol(op.optarg, &end, 0);
|
|
if (*end != '\0')
|
|
error(EXIT_FAILURE, 0, "Invalid window id: %s", op.optarg);
|
|
_options.embed = n;
|
|
break;
|
|
case 'f':
|
|
_options.fullscreen = true;
|
|
break;
|
|
case 'G':
|
|
n = strtol(op.optarg, &end, 0);
|
|
if (*end != '\0' || n < INT_MIN || n > INT_MAX)
|
|
error(EXIT_FAILURE, 0, "Invalid gamma: %s", op.optarg);
|
|
_options.gamma = n;
|
|
break;
|
|
case 'g':
|
|
_options.geometry = op.optarg;
|
|
break;
|
|
case 'h':
|
|
print_usage();
|
|
exit(EXIT_SUCCESS);
|
|
case 'i':
|
|
_options.from_stdin = true;
|
|
break;
|
|
case 'n':
|
|
n = strtol(op.optarg, &end, 0);
|
|
if (*end != '\0' || n <= 0 || n > INT_MAX)
|
|
error(EXIT_FAILURE, 0, "Invalid starting number: %s", op.optarg);
|
|
_options.startnum = n - 1;
|
|
break;
|
|
case 'N':
|
|
_options.res_name = op.optarg;
|
|
break;
|
|
case 'o':
|
|
_options.to_stdout = true;
|
|
break;
|
|
case 'p':
|
|
_options.private_mode = true;
|
|
break;
|
|
case 'q':
|
|
_options.quiet = true;
|
|
break;
|
|
case 'r':
|
|
_options.recursive = true;
|
|
break;
|
|
case 'S':
|
|
f = strtof(op.optarg, &end) * 10.0f;
|
|
if (*end != '\0' || f <= 0 || f >= (float)UINT_MAX)
|
|
error(EXIT_FAILURE, 0, "Invalid slideshow delay: %s", op.optarg);
|
|
_options.slideshow = (unsigned int)f;
|
|
break;
|
|
case 's':
|
|
s = strchr(scalemodes, op.optarg[0]);
|
|
if (s == NULL || *s == '\0' || strlen(op.optarg) != 1)
|
|
error(EXIT_FAILURE, 0, "Invalid scale mode: %s", op.optarg);
|
|
_options.scalemode = s - scalemodes;
|
|
break;
|
|
case 'T':
|
|
title_deprecation_notice(); /* TODO(v31): remove this option */
|
|
break;
|
|
case 't':
|
|
_options.thumb_mode = true;
|
|
break;
|
|
case 'v':
|
|
print_version();
|
|
exit(EXIT_SUCCESS);
|
|
case 'Z':
|
|
_options.scalemode = SCALE_ZOOM;
|
|
_options.zoom = 1.0f;
|
|
break;
|
|
case 'z':
|
|
n = strtol(op.optarg, &end, 0);
|
|
if (*end != '\0' || n <= 0)
|
|
error(EXIT_FAILURE, 0, "Invalid zoom level: %s", op.optarg);
|
|
_options.scalemode = SCALE_ZOOM;
|
|
_options.zoom = (float) n / 100.0f;
|
|
break;
|
|
case '0':
|
|
_options.using_null = true;
|
|
break;
|
|
case OPT_AA:
|
|
if (op.optarg != NULL && !STREQ(op.optarg, "no"))
|
|
error(EXIT_FAILURE, 0, "Invalid argument for option --anti-alias: %s", op.optarg);
|
|
_options.anti_alias = op.optarg == NULL;
|
|
break;
|
|
}
|
|
}
|
|
|
|
_options.filenames = argv + op.optind;
|
|
_options.filecnt = argc - op.optind;
|
|
|
|
if (_options.filecnt == 1 && STREQ(_options.filenames[0], "-")) {
|
|
_options.filenames++;
|
|
_options.filecnt--;
|
|
_options.from_stdin = true;
|
|
}
|
|
}
|