From 88c6a183de3e99ce386e8ee4f47b449e7c53c2e9 Mon Sep 17 00:00:00 2001 From: Derrick Brashear Date: Thu, 7 Mar 2013 06:53:16 -0500 Subject: [PATCH] afscp: null-terminate root.cell dir if needed in dynroot mode instead of doing a check for something which will never be true, and then terminating, just terminate if it's not already null-terminated. Reviewed-on: http://gerrit.openafs.org/9439 Tested-by: BuildBot Reviewed-by: Chaskiel Grundman Reviewed-by: Derrick Brashear (cherry picked from commit ceac74a6baad79155adaa692639b1d9f403525b6) Change-Id: I14d3de25bca5b1ba1878048aac1973518f8c2359 Reviewed-on: http://gerrit.openafs.org/9583 Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- src/libafscp/afscp_dir.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/src/libafscp/afscp_dir.c b/src/libafscp/afscp_dir.c index 5233c156a..513a78388 100644 --- a/src/libafscp/afscp_dir.c +++ b/src/libafscp/afscp_dir.c @@ -373,11 +373,8 @@ gettoproot(struct afscp_cell *cell, char *p, char **q, r = p; while (*r && *r != '/') r++; - if (!*r && !p) { - afscp_errno = ENODEV; - return 1; - } - *r++ = 0; + if (*r) + *r++ = 0; *q = r; afs_dprintf(("gettoproot: dynroot looking up cell %s\n", p)); cell = afscp_CellByName(p, NULL); -- 2.39.5