[GNUnet-SVN] r7441 - GNUnet/src/applications/fs/fsui

[gnunet]

Author: grothoff
Date: 2008-07-16 23:10:36 -0600 (Wed, 16 Jul 2008)
New Revision: 7441

Modified:
   GNUnet/src/applications/fs/fsui/download.c
Log:
do not log unlink errors that are normal, handle directories as well

Modified: GNUnet/src/applications/fs/fsui/download.c
===================================================================
--- GNUnet/src/applications/fs/fsui/download.c  2008-07-17 05:07:41 UTC (rev 
7440)
+++ GNUnet/src/applications/fs/fsui/download.c  2008-07-17 05:10:36 UTC (rev 
7441)
@@ -601,9 +601,20 @@
       dl->state = GNUNET_FSUI_ABORTED_JOINED;
     }
   if (0 != UNLINK (dl->filename))
-    GNUNET_GE_LOG_STRERROR_FILE (dl->ctx->ectx,
-                                 GNUNET_GE_WARNING | GNUNET_GE_USER |
-                                 GNUNET_GE_BULK, "unlink", dl->filename);
+    {
+      if (errno == EISDIR)
+       {
+         if ( (0 != RMDIR(dl->filename)) &&
+              (errno != ENOTEMPTY) ) 
+           GNUNET_GE_LOG_STRERROR_FILE (dl->ctx->ectx,
+                                        GNUNET_GE_WARNING | GNUNET_GE_USER |
+                                        GNUNET_GE_BULK, "rmdir", dl->filename);
+       }
+      else if (errno != ENOENT)
+       GNUNET_GE_LOG_STRERROR_FILE (dl->ctx->ectx,
+                                    GNUNET_GE_WARNING | GNUNET_GE_USER |
+                                    GNUNET_GE_BULK, "unlink", dl->filename);
+    }
   GNUNET_mutex_unlock (ctx->lock);
   return GNUNET_OK;
 }