From: Masatake YAMATO Date: Sat, 3 Jun 2006 17:49:36 +0000 (+0000) Subject: (main): Exit with EXIT_FAILURE if BROWSE file doesn't exist, is not seekable, not... X-Git-Tag: emacs-pretest-22.0.90~2087 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=0f29c66d2557458cd49b32ad48d5baed25533295;p=emacs.git (main): Exit with EXIT_FAILURE if BROWSE file doesn't exist, is not seekable, not is failed in ftall. --- diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index eaaa293e293..40b4779dea4 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog @@ -1,3 +1,8 @@ +2006-06-04 Masatake YAMATO + + * ebrowse.c (main): Exit with EXIT_FAILURE if BROWSE file + doesn't exist, is not seekable, not is failed in ftall. + 2006-06-03 Eli Zaretskii * makefile.w32-in (ALL): Add sorted-doc and digest-doc. diff --git a/lib-src/ebrowse.c b/lib-src/ebrowse.c index 94fa9114d23..398dd10896e 100644 --- a/lib-src/ebrowse.c +++ b/lib-src/ebrowse.c @@ -3909,17 +3909,31 @@ main (argc, argv) fp = fopen (out_filename, "r"); if (fp == NULL) - yyerror ("file `%s' must exist for --append", out_filename); + { + yyerror ("file `%s' must exist for --append", out_filename); + exit (EXIT_FAILURE); + } rc = fseek (fp, 0, SEEK_END); if (rc == -1) - yyerror ("error seeking in file `%s'", out_filename); + { + yyerror ("error seeking in file `%s'", out_filename); + exit (EXIT_FAILURE); + } rc = ftell (fp); if (rc == -1) - yyerror ("error getting size of file `%s'", out_filename); + { + yyerror ("error getting size of file `%s'", out_filename); + exit (EXIT_FAILURE); + } + else if (rc == 0) - yyerror ("file `%s' is empty", out_filename); + { + yyerror ("file `%s' is empty", out_filename); + /* It may be ok to use an empty file for appending. + exit (EXIT_FAILURE); */ + } fclose (fp); }