[GNUnet-SVN] r5214 - GNUnet/src/util/disk

[gnunet]

Author: grothoff
Date: 2007-07-01 20:34:44 -0600 (Sun, 01 Jul 2007)
New Revision: 5214

Modified:
   GNUnet/src/util/disk/storage.c
Log:
expand filename before test

Modified: GNUnet/src/util/disk/storage.c
===================================================================
--- GNUnet/src/util/disk/storage.c      2007-07-02 01:50:07 UTC (rev 5213)
+++ GNUnet/src/util/disk/storage.c      2007-07-02 02:34:44 UTC (rev 5214)
@@ -264,27 +264,39 @@
                   const char * fil) {
   struct stat filestat;
   int ret;
+  char * rdir;
 
-  ret = STAT(fil, &filestat);
+  rdir = string_expandFileName(ectx,
+                              fil);
+  if (rdir == NULL)
+    return SYSERR;
+
+  ret = STAT(rdir, &filestat);
   if (ret != 0) {
     if (errno != ENOENT) {
       GE_LOG_STRERROR_FILE(ectx,
                           GE_WARNING | GE_USER | GE_ADMIN | GE_REQUEST,
                           "stat",
-                          fil);
+                          rdir);
+      FREE(rdir);
       return SYSERR;
     }
+    FREE(rdir);
     return NO;
   }
-  if (! S_ISREG(filestat.st_mode))
+  if (! S_ISREG(filestat.st_mode)) {
+    FREE(rdir);
     return NO;
-  if (ACCESS(fil, R_OK) < 0 ) {
+  }
+  if (ACCESS(rdir, R_OK) < 0 ) {
     GE_LOG_STRERROR_FILE(ectx,
                         GE_WARNING | GE_USER | GE_ADMIN | GE_REQUEST,
                         "access",
-                        fil);
+                        rdir);
+    FREE(rdir);
     return SYSERR;
   }
+  FREE(rdir);
   return YES;
 }