Handle existing config directory in vncpasswd

CendioOssman · LMattsson · commit 4c573f89f2f5 · 2024-10-18T11:03:48.000+02:00
This fixes commit a79c33d. (cherry picked from commit 445e023)
diff --git a/unix/vncpasswd/vncpasswd.cxx b/unix/vncpasswd/vncpasswd.cxx
@@ -163,8 +163,10 @@ int main(int argc, char** argv)
       exit(1);
     }
     if (os::mkdir_p(configDir, 0777) == -1) {
-      fprintf(stderr, "Could not create VNC config directory: %s\n", strerror(errno));
-      exit(1);
+      if (errno != EEXIST) {
+        fprintf(stderr, "Could not create VNC config directory: %s\n", strerror(errno));
+        exit(1);
+      }
     }
     snprintf(fname, sizeof(fname), "%s/passwd", configDir);
   }

Original file line number	Diff line number	Diff line change
`@@ -163,8 +163,10 @@ int main(int argc, char** argv)`
`163`	`163`	`exit(1);`
`164`	`164`	`}`
`165`	`165`	`if (os::mkdir_p(configDir, 0777) == -1) {`
`166`		`- fprintf(stderr, "Could not create VNC config directory: %s\n", strerror(errno));`
`167`		`- exit(1);`
	`166`	`+ if (errno != EEXIST) {`
	`167`	`+ fprintf(stderr, "Could not create VNC config directory: %s\n", strerror(errno));`
	`168`	`+ exit(1);`
	`169`	`+ }`
`168`	`170`	`}`
`169`	`171`	`snprintf(fname, sizeof(fname), "%s/passwd", configDir);`
`170`	`172`	`}`