Merging with upstream

diff --git a/src/curses/ux_init.c b/src/curses/ux_init.c
index dff3e231342b1149539f4a76c85778e8ba692161..1c6b5d63e4e45f84f9432d83448a1e0192239b9b 100644 (file)
--- 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 1404417e6b7105330095f7e6d87e69c8cb81358f..267a4f0b238df8016662570a209368e4d2815d96 100644 (file)
--- 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 c1d4e2ad0614245ef867bfb3e36a19c67dd7f60a..86289696acc049986e2b5eff4b149bed31f302b5 100644 (file)
--- 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]);