From ee390d6c5dd604f9af482c5cf2d102e0dea1cc52 Mon Sep 17 00:00:00 2001 From: Bill Lash Date: Fri, 26 Jul 2019 21:43:36 -0500 Subject: [PATCH] Merging with upstream --- src/curses/ux_init.c | 3 --- src/dumb/dumb_blorb.c | 5 +---- src/dumb/dumb_init.c | 3 --- 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c index dff3e23..1c6b5d6 100644 --- a/src/curses/ux_init.c +++ b/src/curses/ux_init.c @@ -340,9 +340,6 @@ void os_process_arguments (int argc, char *argv[]) f_setup.story_file = strdup(argv[zoptind]); f_setup.story_name = strdup(basename(argv[zoptind])); - if (argv[optind+1] != NULL) - f_setup.blorb_file = strdup(argv[optind+1]); - if (argv[zoptind+1] != NULL) f_setup.blorb_file = strdup(argv[zoptind+1]); diff --git a/src/dumb/dumb_blorb.c b/src/dumb/dumb_blorb.c index 1404417..267a4f0 100644 --- a/src/dumb/dumb_blorb.c +++ b/src/dumb/dumb_blorb.c @@ -92,12 +92,9 @@ bb_err_t dumb_blorb_init(char *filename) /* Check if foo.blb is there. */ if ((fp = fopen(mystring, "rb")) == NULL) { - mystring = strdup(f_setup.blorb_file); - else { - p = strrchr(mystring, '.'); + p = strrchr(mystring, '.'); if (p != NULL) *p = '\0'; strncat(mystring, EXT_BLORB3, len2 * sizeof(char)); - } if (!(fp = fopen(mystring, "rb"))) return bb_err_NoBlorb; diff --git a/src/dumb/dumb_init.c b/src/dumb/dumb_init.c index c1d4e2a..8628969 100644 --- a/src/dumb/dumb_init.c +++ b/src/dumb/dumb_init.c @@ -149,9 +149,6 @@ void os_process_arguments(int argc, char *argv[]) f_setup.story_file = strdup(argv[zoptind]); f_setup.story_name = strdup(basename(argv[zoptind])); - if (argv[optind+1] != NULL) - f_setup.blorb_file = strdup(argv[optind+1]); - if (argv[zoptind+1] != NULL) f_setup.blorb_file = strdup(argv[zoptind+1]); -- 2.34.1