* yasm.c (main): Fix longstanding bug of putting the default object file

output into the source directory rather than the current directory (like
C compilers do).

svn path=/trunk/yasm/; revision=1435

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index b8c035a6ac544c899579d3f9f87cba5090b064a4..b129187388937305b242380e6667a46cb6d188e8 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -234,6 +234,7 @@ main(int argc, char *argv[])
     yasm_section *def_sect;
     size_t i;
     yasm_arch_create_error arch_error;
+    const char *base_filename;
 
 #if defined(HAVE_SETLOCALE) && defined(HAVE_LC_MESSAGES)
     setlocale(LC_MESSAGES, "");
@@ -328,11 +329,15 @@ main(int argc, char *argv[])
                 if (in == stdin)
                     /* Default to yasm.out if no obj filename specified */
                     obj_filename = yasm__xstrdup("yasm.out");
-                else
-                    /* replace (or add) extension */
-                    obj_filename = replace_extension(in_filename,
-                                                     cur_objfmt_module->extension,
-                                                     "yasm.out");
+                else {
+                    /* replace (or add) extension to base filename */
+                   yasm__splitpath(in_filename, &base_filename);
+                   if (base_filename[0] == '\0')
+                       obj_filename = yasm__xstrdup("yasm.out");
+                   else
+                       obj_filename = replace_extension(base_filename,
+                            cur_objfmt_module->extension, "yasm.out");
+               }
             }
        } else {
            /* Open output (object) file */
@@ -411,11 +416,16 @@ main(int argc, char *argv[])
        if (in == stdin)
            /* Default to yasm.out if no obj filename specified */
            obj_filename = yasm__xstrdup("yasm.out");
-       else
-           /* replace (or add) extension */
-           obj_filename = replace_extension(in_filename,
-                                            cur_objfmt_module->extension,
-                                            "yasm.out");
+       else {
+           /* replace (or add) extension to base filename */
+           yasm__splitpath(in_filename, &base_filename);
+           if (base_filename[0] == '\0')
+               obj_filename = yasm__xstrdup("yasm.out");
+           else
+               obj_filename = replace_extension(base_filename,
+                                                cur_objfmt_module->extension,
+                                                "yasm.out");
+       }
     }
 
     /* Create object */