66 lines
1.8 KiB
Diff
66 lines
1.8 KiB
Diff
diff -up minicom-2.3/src/file.c.gotodir minicom-2.3/src/file.c
|
|
--- minicom-2.3/src/file.c.gotodir 2008-08-29 12:41:21.000000000 +0200
|
|
+++ minicom-2.3/src/file.c 2008-08-29 12:41:21.000000000 +0200
|
|
@@ -282,6 +282,8 @@ static int new_filedir(GETSDIR_ENTRY *o_
|
|
int initial_y = (76 - (WHAT_NR_OPTIONS * WHAT_WIDTH >= 76
|
|
? 74 : WHAT_NR_OPTIONS * WHAT_WIDTH)) / 2;
|
|
size_t i;
|
|
+ int rval;
|
|
+ char * new_prev_dir;
|
|
|
|
cur = 0;
|
|
ocur = 0;
|
|
@@ -295,11 +297,6 @@ static int new_filedir(GETSDIR_ENTRY *o_
|
|
dprev = -1;
|
|
tag_cnt = 0;
|
|
|
|
- /* got to do some error-checking here!!! Maybe use mcd(), too! */
|
|
- if (prev_dir != NULL)
|
|
- free(prev_dir);
|
|
- prev_dir = getcwd(NULL, BUFSIZ);
|
|
-
|
|
/*
|
|
* get last directory
|
|
*/
|
|
@@ -329,7 +326,30 @@ static int new_filedir(GETSDIR_ENTRY *o_
|
|
if (strlen(work_dir) > 1 && work_dir[strlen(work_dir) - 1] == '/')
|
|
work_dir[strlen(work_dir) - 1] = (char)0;
|
|
|
|
- chdir(work_dir);
|
|
+ /* get the current working directory, which will become the prev_dir, on success */
|
|
+ new_prev_dir = getcwd(NULL, BUFSIZ);
|
|
+ if (new_prev_dir == NULL) {
|
|
+ return -1;
|
|
+ }
|
|
+
|
|
+ rval = chdir(work_dir);
|
|
+ if (rval == 0) {
|
|
+ /* was able to change to new working directory */
|
|
+ free(prev_dir);
|
|
+ prev_dir = new_prev_dir;
|
|
+ }
|
|
+ else {
|
|
+ /* Could not change to the new working directory */
|
|
+ mc_wbell();
|
|
+ werror(
|
|
+ _("Could not change to directory %s (%s)"),
|
|
+ work_dir,
|
|
+ strerror(errno));
|
|
+
|
|
+ /* restore the previous working directory */
|
|
+ free(work_dir);
|
|
+ work_dir = set_work_dir(new_prev_dir, strlen(new_prev_dir));
|
|
+ }
|
|
|
|
/* All right, draw the file directory! */
|
|
|
|
@@ -435,7 +455,7 @@ static int new_filedir(GETSDIR_ENTRY *o_
|
|
mc_wredraw(dsub, 1);
|
|
}
|
|
|
|
- return 0;
|
|
+ return rval;
|
|
}
|
|
|
|
|