Add chdir and set errno in fileExists.

bbidulock · May 9, 2024 · 5eda9c0 · 5eda9c0
1 parent 5b44cc1
commit 5eda9c0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/src/theminst.cc b/src/theminst.cc
@@ -53,7 +53,7 @@ static void install_extra(const char* name, bool* result) {
     if (dir.isWritable() == false) {
         return fail("%s", dir.string());
     }
-    if (chdir(dir.string())) {
+    if (dir.chdir()) {
         return fail("%s", dir.string());
     }
 

diff --git a/src/upath.cc b/src/upath.cc
@@ -124,7 +124,12 @@ bool upath::isRelative() const {
 
 bool upath::fileExists() {
     struct stat sb;
-    return stat(&sb) == 0 && S_ISREG(sb.st_mode);
+    if (stat(&sb) == 0) {
+        if (S_ISREG(sb.st_mode))
+            return true;
+        errno = S_ISDIR(sb.st_mode) ? EISDIR : EINVAL;
+    }
+    return false;
 }
 
 off_t upath::fileSize() {
@@ -166,6 +171,10 @@ int upath::mkdir(int mode) {
     return ::mkdir(string(), mode_t(mode));
 }
 
+int upath::chdir() {
+    return ::chdir(string());
+}
+
 int upath::open(int flags, int mode) {
     return ::open(string(), flags, mode);
 }

diff --git a/src/upath.h b/src/upath.h
@@ -45,6 +45,7 @@ class upath {
     bool hasProtocol() const;
     int access(int mode = 0);
     int mkdir(int mode = 0700);
+    int chdir();
     int open(int flags, int mode = 0666);
     FILE* fopen(const char *mode);
     int stat(struct stat *st);