Use stdout as the default output file if stdin is the input.

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

diff --git a/frontends/yasm/yasm.c b/frontends/yasm/yasm.c
index 95947581692dc7c7c5b869a818aab6e5fa48229a..8dccd9d04fa07cdd7e2dd85cd190d15605816d35 100644 (file)
--- a/frontends/yasm/yasm.c
+++ b/frontends/yasm/yasm.c
@@ -122,6 +122,8 @@ main(int argc, char *argv[])
     if (!in) {
        in = stdin;
        switch_filename("<STDIN>");
+       if (!obj)
+           obj = stdout;
     }
 
     /* Set x86 as the architecture */
@@ -168,7 +170,8 @@ main(int argc, char *argv[])
 
     sections = cur_parser->do_parse(cur_parser, in);
 
-    fclose(in);
+    if (in != stdin)
+       fclose(in);
 
     if (OutputAllErrorWarning() > 0) {
        sections_delete(sections);
@@ -200,7 +203,9 @@ main(int argc, char *argv[])
     /* Finalize the object output */
     cur_objfmt->finalize();
 
-    fclose(obj);
+    if (obj != stdout)
+       fclose(obj);
+
     if (obj_filename)
        xfree(obj_filename);
 

diff --git a/src/main.c b/src/main.c
index 95947581692dc7c7c5b869a818aab6e5fa48229a..8dccd9d04fa07cdd7e2dd85cd190d15605816d35 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -122,6 +122,8 @@ main(int argc, char *argv[])
     if (!in) {
        in = stdin;
        switch_filename("<STDIN>");
+       if (!obj)
+           obj = stdout;
     }
 
     /* Set x86 as the architecture */
@@ -168,7 +170,8 @@ main(int argc, char *argv[])
 
     sections = cur_parser->do_parse(cur_parser, in);
 
-    fclose(in);
+    if (in != stdin)
+       fclose(in);
 
     if (OutputAllErrorWarning() > 0) {
        sections_delete(sections);
@@ -200,7 +203,9 @@ main(int argc, char *argv[])
     /* Finalize the object output */
     cur_objfmt->finalize();
 
-    fclose(obj);
+    if (obj != stdout)
+       fclose(obj);
+
     if (obj_filename)
        xfree(obj_filename);