+2005-05-03 Tom Tromey <tromey@redhat.com>
+
+ PR java/21245:
+ * gjavah.c (main): Unlink output file on error.
+
2005-05-03 Kazu Hirata <kazu@cs.umass.edu>
* constants.c, jvgenmain.c, lang.opt, resource.c: Update
char *output_file = NULL;
int emit_dependencies = 0, suppress_output = 0;
int opt;
+ int local_found_error;
/* Unlock the stdio streams. */
unlock_std_streams ();
exit (1);
}
+ local_found_error = 0;
for (argi = optind; argi < argc; argi++)
{
char *classname = argv[argi];
- char *current_output_file;
+ char *current_output_file = NULL;
const char *classfile_name;
+ /* We reset the error state here so that we can detect errors
+ that occur when processing this file, so the output can be
+ unlinked if need be. */
+ found_error = 0;
+
if (verbose)
printf (_("Processing %s\n"), classname);
if (! output_file)
free_method_name_list ();
process_file (&jcf, out);
JCF_FINISH (&jcf);
+
+ /* If we found an error and we're writing to a real file,
+ delete it. */
+ if (found_error && ! suppress_output && current_output_file != NULL
+ && strcmp (current_output_file, "-"))
+ unlink (current_output_file);
+
if (current_output_file != output_file)
free (current_output_file);
jcf_dependency_write ();
+
+ local_found_error |= found_error;
}
if (out != NULL && out != stdout)
fclose (out);
- return found_error;
+ return local_found_error;
}