Ensure the ChangeLog has been updated

[thirdparty/sarg.git] / lastlog.c

diff --git a/lastlog.c b/lastlog.c
index f033147737f6cc846929d5c9be8309427b5e5750..09a079e5d8e92a91cc9edee1fd6c062a899ec8a0 100644 (file)
--- a/lastlog.c
+++ b/lastlog.c
@@ -1,6 +1,6 @@
 /*
  * SARG Squid Analysis Report Generator      http://sarg.sourceforge.net
- *                                                            1998, 2011
+ *                                                            1998, 2013
  *
  * SARG donations:
  *      please look at http://sarg.sourceforge.net/donations.php
@@ -48,7 +48,7 @@ void mklastlog(const char *outdir)
 
        snprintf(temp,sizeof(temp),"%slastlog1",outdir);
        if((fp_ou=fopen(temp,"w"))==NULL) {
-               debuga(_("(lastlog) Cannot open temporary file %s\n"),temp);
+               debuga(_("(lastlog) Cannot open temporary file %s: %s\n"),temp,strerror(errno));
                exit(EXIT_FAILURE);
        }
 
@@ -73,7 +73,10 @@ void mklastlog(const char *outdir)
        }
 
        closedir( dirp );
-       fclose(fp_ou);
+       if (fclose(fp_ou)==EOF) {
+               debuga(_("Write error in %s: %s\n"),temp,strerror(errno));
+               exit(EXIT_FAILURE);
+       }
 
        snprintf(buf,sizeof(buf),"sort -n -t \"\t\" -k 1,1 -o \"%slastlog\" \"%s\"",outdir,temp);
        cstatus=system(buf);
@@ -84,7 +87,7 @@ void mklastlog(const char *outdir)
        }
 
        if (unlink(temp)) {
-               debuga(_("Cannot delete %s - %s\n"),temp,strerror(errno));
+               debuga(_("Cannot delete \"%s\": %s\n"),temp,strerror(errno));
                exit(EXIT_FAILURE);
        }
 
@@ -92,7 +95,7 @@ void mklastlog(const char *outdir)
                snprintf(temp,sizeof(temp),"%slastlog",outdir);
                if(access(temp, R_OK) == 0) {
                        if (unlink(temp)) {
-                               debuga(_("Cannot delete %s - %s\n"),temp,strerror(errno));
+                               debuga(_("Cannot delete \"%s\": %s\n"),temp,strerror(errno));
                                exit(EXIT_FAILURE);
                        }
                }
@@ -103,7 +106,7 @@ void mklastlog(const char *outdir)
 
        snprintf(temp,sizeof(temp),"%slastlog",outdir);
        if((fp_in=fopen(temp,"r"))==NULL) {
-               debuga(_("(lastlog) Cannot open temporary file %s\n"),temp);
+               debuga(_("(lastlog) Cannot open temporary file %s: %s\n"),temp,strerror(errno));
                exit(EXIT_FAILURE);
        }
 
@@ -128,7 +131,7 @@ void mklastlog(const char *outdir)
        fclose(fp_in);
        snprintf(temp,sizeof(temp),"%slastlog",outdir);
        if (unlink(temp) == -1) {
-               debuga(_("Failed to delete the file %s\n"),temp);
+               debuga(_("Cannot delete \"%s\": %s\n"),temp,strerror(errno));
        }
 
        return;