nano

commit ba987350a9dd026d187be31537d0c47223c3289d
parent f96f4fe61617e5aa51ef30390e3384a6be33de24
Author: Benno Schulenberg <bensberg@justemail.net>
Date:   Sun, 31 Jan 2016 13:06:06 +0000

Being more specific in how a given path is invalid.


git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@5602 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

Diffstat:
M
ChangeLog
 | 
4
++++
M
src/files.c
 | 
22
+++++++++++++++++-----
M
src/proto.h
 | 
3
+--

3 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,7 @@
+2016-01-31  Benno Schulenberg  <bensberg@justemail.net>
+	* src/files.c (has_valid_path): Be more specific in how a given path
+	is invalid.  The change was improved by Rishabh Dave.
+
 2016-01-29  Benno Schulenberg  <bensberg@justemail.net>
 	* src/files.c (do_insertfile): Do display the buffer when configured
 	with only --disable-histories.  This fixes Savannah bug #47011.
diff --git a/src/files.c b/src/files.c
@@ -38,20 +38,32 @@ bool has_valid_path(const char *filename)
 {
     char *parentdir;
     struct stat parentinfo;
-    bool validity = TRUE;
+    bool validity = FALSE;
 
     if (strrchr(filename, '/') == NULL)
 	parentdir = mallocstrcpy(NULL, ".");
     else
 	parentdir = dirname(mallocstrcpy(NULL, filename));
 
-    if (stat(parentdir, &parentinfo) == -1 || !S_ISDIR(parentinfo.st_mode)) {
-	statusbar(_("Directory '%s' does not exist"), parentdir);
-	validity = FALSE;
-	beep();
+    if (stat(parentdir, &parentinfo) == -1) {
+	if (errno == ENOENT)
+	    statusbar(_("Directory '%s' does not exist"), parentdir);
+	else
+	    statusbar(_("Path '%s': %s"), parentdir, strerror(errno));
+    } else if (!S_ISDIR(parentinfo.st_mode)) {
+	statusbar(_("Path '%s' is not a directory"), parentdir);
+    } else {
+	if (access(parentdir, X_OK) == -1)
+	    statusbar(_("Path '%s' is not accessible"), parentdir);
+	else
+	    validity = TRUE;
     }
 
     free(parentdir);
+
+    if (!validity)
+	beep();
+
     return validity;
 }
 
diff --git a/src/proto.h b/src/proto.h
@@ -280,8 +280,7 @@ void do_cut_till_eof(void);
 #endif
 void do_uncut_text(void);
 
-/* All functions in files.c. */
-void verify_path(const char *filename);
+/* Most functions in files.c. */
 void make_new_buffer(void);
 void initialize_buffer_text(void);
 bool open_buffer(const char *filename, bool undoable);