[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Cvs-cvs] Changes to ccvs/src/expand_path.c [cvs1-11-x-branch]
From: |
Larry Jones |
Subject: |
[Cvs-cvs] Changes to ccvs/src/expand_path.c [cvs1-11-x-branch] |
Date: |
Fri, 30 Sep 2005 12:28:56 -0400 |
Index: ccvs/src/expand_path.c
diff -u ccvs/src/expand_path.c:1.21.6.5 ccvs/src/expand_path.c:1.21.6.6
--- ccvs/src/expand_path.c:1.21.6.5 Tue Jul 12 14:07:54 2005
+++ ccvs/src/expand_path.c Fri Sep 30 16:28:55 2005
@@ -140,7 +140,7 @@
expand_string (&mybuf, &mybuf_size, p + 1);
mybuf[p++] = name[s];
}
- if (name[s] == '}') ++s;
+ if (name[s] != '\0') ++s;
}
else
{
@@ -202,18 +202,18 @@
else
error (0, 0, "%s:tilde expansion not supported on this system",
file);
- return NULL;
+ goto error_exit;
#else
struct passwd *ps;
ps = getpwnam (buf + d);
- if (ps == 0)
+ if (ps == NULL)
{
if (line != 0)
error (0, 0, "%s:%d: no such user %s",
file, line, buf + d);
else
error (0, 0, "%s: no such user %s", file, buf + d);
- return NULL;
+ goto error_exit;
}
e = ps->pw_dir;
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Cvs-cvs] Changes to ccvs/src/expand_path.c [cvs1-11-x-branch],
Larry Jones <=