From e4acabada7ccef152cdfaef74efb2f72fe54778d Mon Sep 17 00:00:00 2001 From: Guaxinim5573 Date: Wed, 14 Apr 2021 17:25:11 -0300 Subject: [PATCH] merge --custom and --image --- uwufetch.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/uwufetch.c b/uwufetch.c index fbc8c38..08a264f 100644 --- a/uwufetch.c +++ b/uwufetch.c @@ -81,25 +81,20 @@ int main(int argc, char *argv[]) { int opt = 0; static struct option long_options[] = { { "ascii", no_argument, NULL, 'a' }, - { "custom", required_argument, NULL, 'c' }, { "config", required_argument, NULL, 0}, { "distro", required_argument, NULL, 'd' }, { "help", no_argument, NULL, 'h' }, - { "image", no_argument, NULL, 'i' }, + { "image", optional_argument, NULL, 'i' }, { "list", no_argument, NULL, 'l' }, { NULL, 0, NULL, 0 } }; get_info(); parse_config(); - while ((opt = getopt_long(argc, argv, "ad:hilc:", long_options, NULL)) != -1) { + while ((opt = getopt_long(argc, argv, "ad:hi::l", long_options, NULL)) != -1) { switch (opt) { case 'a': ascii_image_flag = 0; break; - case 'c': - ascii_image_flag = 1; - sprintf(image_name, "%s", optarg); - break; case 'd': if (optarg) sprintf(version_name, "%s", optarg); break; @@ -108,6 +103,10 @@ int main(int argc, char *argv[]) { return 0; case 'i': ascii_image_flag = 1; + char *image_dir = NULL; + if(!optarg && argv[optind] != NULL && argv[optind][0] != '-') image_dir = argv[optind++]; + else image_dir = optarg; + if(image_dir != NULL) sprintf(image_name, "%s", image_dir); break; case 'l': list(argv[0]);