Changeset 58115ae in mainline

Timestamp:

2011-07-27T23:05:15Z (14 years ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

75406dc

Parents:

fd4b636

Message:

Make remove() future-proof and add rmdir() wrapper.

Location:

uspace/lib/posix

Files:

• stdio.c (modified) (1 diff)
• unistd.c (modified) (1 diff)
• unistd.h (modified) (2 diffs)

uspace/lib/posix/stdio.c

@@ -693 +693 @@
 
 /**
- * Remove a file.
+ * Remove a file or directory.
  *
  * @param path Pathname of the file that shall be removed.
- * @return Zero on success, -1 otherwise.
+ * @return Zero on success, -1 (with errno set) otherwise.
  */
 int posix_remove(const char *path)
 {
-        // FIXME: unlink() and rmdir() seem to be equivalent at the moment,
-        //        but that does not have to be true forever
-        return unlink(path);
+        struct stat st;
+        int rc = stat(path, &st);
+        
+        if (rc != EOK) {
+                errno = -rc;
+                return -1;
+        }
+        
+        if (st.is_directory) {
+                rc = rmdir(path);
+        } else {
+                rc = unlink(path);
+        }
+        
+        if (rc != EOK) {
+                errno = -rc;
+                return -1;
+        }
+        return 0;
 }
 

uspace/lib/posix/unistd.c

@@ -176 +176 @@
                 return rc;
         }
+}
+
+/**
+ * Remove a directory.
+ *
+ * @param path Directory pathname.
+ * @return Zero on success, -1 otherwise.
+ */
+int posix_rmdir(const char *path)
+{
+        int rc = rmdir(path);
+        if (rc != EOK) {
+                errno = -rc;
+                return -1;
+        }
+        return 0;
 }
 

uspace/lib/posix/unistd.h

@@ -73 +73 @@
 
 /* Deleting Files */
+extern int posix_rmdir(const char *path);
 extern int posix_unlink(const char *path);
 
@@ -156 +157 @@
         #define read posix_read
 
+        #define rmdir posix_rmdir
         #define unlink posix_unlink