Minor fixes

2 files changed, 13 insertions, 2 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index bf38ec8..7ba9832 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -42,7 +42,7 @@ wydawca_SOURCES=\
  report.c
 
 BUILT_SOURCES=cmdline.h
-EXTRA_DIST=cmdline.opt getopt.m4 pp-setup
+EXTRA_DIST=cmdline.opt getopt.m4 pp-setup update-2.0.awk
 
 SUFFIXES=.opt .c .h
 
diff --git a/src/null.c b/src/null.c
index 667f229..5ec85f3 100644
--- a/src/null.c
+++ b/src/null.c
@@ -20,9 +20,17 @@ int
 null_move_file (struct file_triplet *trp, struct spool *spool,
 		enum file_type file_id, const char *reldir)
 {
+  const char *file_name = trp->file[file_id].name;
   if (debug_level)
     logmsg (LOG_DEBUG, "%s: installing file `%s/%s'",
-	    spool->url, reldir, trp->file[file_id].name);
+	    spool->url, reldir, file_name);
+  UPDATE_STATS (STAT_UPLOADS);
+  if (unlink (file_name))
+    {
+      logmsg (LOG_ERR, "Cannot unlink %s: %s",
+	      file_name, strerror (errno));
+      return 1;
+    }
   return 0;
 }
 
@@ -32,6 +40,7 @@ null_archive_file (struct file_triplet *trp, struct spool *spool,
 {
   if (debug_level)
     logmsg (LOG_DEBUG, "%s: archiving `%s'",  spool->url, file_name);
+  UPDATE_STATS (STAT_ARCHIVES);
   return 0;
 }
 
@@ -43,6 +52,7 @@ null_symlink_file (struct file_triplet *trp, struct spool *spool,
   if (debug_level)
     logmsg (LOG_DEBUG, "%s: symlinking `%s' to `%s'",
 	    spool->url, wanted_src, wanted_dst);
+  UPDATE_STATS (STAT_SYMLINKS);
   return 0;
 }
 
@@ -53,6 +63,7 @@ null_rmsymlink_file (struct file_triplet *trp, struct spool *spool,
   if (debug_level)
     logmsg (LOG_DEBUG, "%s: removing symlink `%s/%s'",
 	    spool->url, reldir, file_name);
+  UPDATE_STATS (STAT_RMSYMLINKS);
   return 0;
 }