|
 |
0a55867 |
From 19c75aec6843b827fa7ef3f39174090ee7f8ac18 Mon Sep 17 00:00:00 2001
|
|
|
0a55867 |
From: Peter Stephenson <p.w.stephenson@ntlworld.com>
|
|
|
0a55867 |
Date: Thu, 22 Jan 2015 20:20:15 +0000
|
|
|
6a607c8 |
Subject: [PATCH 1/2] 34331: better handling of NULL in cd.
|
|
|
0a55867 |
|
|
|
0a55867 |
Problem was return from symbolic link expander in weird cases
|
|
|
0a55867 |
where there file system isn't behaving itself properly.
|
|
|
0a55867 |
|
|
|
0a55867 |
Upstream-commit: 12b813b5895cae579e403dafe43878868f27fe0f
|
|
|
0a55867 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
0a55867 |
---
|
|
|
0a55867 |
Src/builtin.c | 8 +++++---
|
|
|
0a55867 |
Src/utils.c | 11 +++++++----
|
|
|
0a55867 |
2 files changed, 12 insertions(+), 7 deletions(-)
|
|
|
0a55867 |
|
|
|
0a55867 |
diff --git a/Src/builtin.c b/Src/builtin.c
|
|
|
0a55867 |
index 2118835..489ca23 100644
|
|
|
0a55867 |
--- a/Src/builtin.c
|
|
|
0a55867 |
+++ b/Src/builtin.c
|
|
|
0a55867 |
@@ -1156,9 +1156,11 @@ cd_new_pwd(int func, LinkNode dir, int quiet)
|
|
|
0a55867 |
zsfree(getlinknode(dirstack));
|
|
|
0a55867 |
|
|
|
0a55867 |
if (chasinglinks) {
|
|
|
0a55867 |
- s = new_pwd;
|
|
|
0a55867 |
- new_pwd = findpwd(s);
|
|
|
0a55867 |
- zsfree(s);
|
|
|
0a55867 |
+ s = findpwd(new_pwd);
|
|
|
0a55867 |
+ if (s) {
|
|
|
0a55867 |
+ zsfree(new_pwd);
|
|
|
0a55867 |
+ new_pwd = s;
|
|
|
0a55867 |
+ }
|
|
|
0a55867 |
}
|
|
|
0a55867 |
if (isset(PUSHDIGNOREDUPS)) {
|
|
|
0a55867 |
LinkNode n;
|
|
|
0a55867 |
diff --git a/Src/utils.c b/Src/utils.c
|
|
|
0a55867 |
index e6eb8e6..80396a2 100644
|
|
|
0a55867 |
--- a/Src/utils.c
|
|
|
0a55867 |
+++ b/Src/utils.c
|
|
|
0a55867 |
@@ -1049,10 +1049,13 @@ getnameddir(char *name)
|
|
|
0a55867 |
if ((pw = getpwnam(name))) {
|
|
|
0a55867 |
char *dir = isset(CHASELINKS) ? xsymlink(pw->pw_dir)
|
|
|
0a55867 |
: ztrdup(pw->pw_dir);
|
|
|
0a55867 |
- adduserdir(name, dir, ND_USERNAME, 1);
|
|
|
0a55867 |
- str = dupstring(dir);
|
|
|
0a55867 |
- zsfree(dir);
|
|
|
0a55867 |
- return str;
|
|
|
0a55867 |
+ if (dir) {
|
|
|
0a55867 |
+ adduserdir(name, dir, ND_USERNAME, 1);
|
|
|
0a55867 |
+ str = dupstring(dir);
|
|
|
0a55867 |
+ zsfree(dir);
|
|
|
0a55867 |
+ return str;
|
|
|
0a55867 |
+ } else
|
|
|
0a55867 |
+ return ztrdup(pw->pw_dir);
|
|
|
0a55867 |
}
|
|
|
0a55867 |
}
|
|
|
0a55867 |
#endif /* HAVE_GETPWNAM */
|
|
|
0a55867 |
--
|
|
|
0a55867 |
2.1.0
|
|
|
0a55867 |
|
|
|
6a607c8 |
|
|
|
6a607c8 |
From d0777e66d47d0a87f3171962d8137a6cb75d7ade Mon Sep 17 00:00:00 2001
|
|
|
6a607c8 |
From: Peter Stephenson <p.w.stephenson@ntlworld.com>
|
|
|
6a607c8 |
Date: Sun, 25 Jan 2015 18:03:20 +0000
|
|
|
6a607c8 |
Subject: [PATCH 2/2] 34383: ztrdup() should be dupstring() in new cd code
|
|
|
6a607c8 |
|
|
|
6a607c8 |
Upstream-commit: ccd3663d4e9a1749450b35cc689359f78a310c04
|
|
|
6a607c8 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
6a607c8 |
---
|
|
|
6a607c8 |
Src/utils.c | 2 +-
|
|
|
6a607c8 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
6a607c8 |
|
|
|
6a607c8 |
diff --git a/Src/utils.c b/Src/utils.c
|
|
|
6a607c8 |
index 80396a2..ef71210 100644
|
|
|
6a607c8 |
--- a/Src/utils.c
|
|
|
6a607c8 |
+++ b/Src/utils.c
|
|
|
6a607c8 |
@@ -1055,7 +1055,7 @@ getnameddir(char *name)
|
|
|
6a607c8 |
zsfree(dir);
|
|
|
6a607c8 |
return str;
|
|
|
6a607c8 |
} else
|
|
|
6a607c8 |
- return ztrdup(pw->pw_dir);
|
|
|
6a607c8 |
+ return dupstring(pw->pw_dir);
|
|
|
6a607c8 |
}
|
|
|
6a607c8 |
}
|
|
|
6a607c8 |
#endif /* HAVE_GETPWNAM */
|
|
|
6a607c8 |
--
|
|
|
6a607c8 |
2.1.0
|
|
|
6a607c8 |
|