mirrors
/
nano
mirror of git://git.sv.gnu.org/nano.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

simplify real_dir_from_tilde() 

git-svn-id: svn://svn.savannah.gnu.org/nano/branches/nano_2_0_branch/nano@4079 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
This commit is contained in:
David Lawrence Ramsey 2007-04-18 17:13:36 +00:00
parent 5021cc597f
commit 13de7c199c
2 changed files with 15 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@ -9,6 +9,7 @@ CVS code -
erroneously treated as users' home directories (e.g. "~d/"
would be treated as "~daemon/"). (DLR, found by Justin
Fletcher)
- Simplify. (DLR)
input_tab()
- Don't bother checking if num_matches is less than zero, as
it's a size_t and hence unsigned. (DLR)

30
src/files.c
View File

@ -1973,13 +1973,13 @@ void do_writeout_void(void)
* convert ~user/ and ~/ notation. */
char *real_dir_from_tilde(const char *buf)
{
char *dirtmp = NULL;
char *retval;
assert(buf != NULL);
if (buf[0] == '~') {
size_t i;
const char *tilde_dir = NULL;
char *tilde_dir;
/* Figure out how much of the str we need to compare. */
for (i = 1; buf[i] != '/' && buf[i] != '\0'; i++)
@ -1988,32 +1988,30 @@ char *real_dir_from_tilde(const char *buf)
/* Get the home directory. */
if (i == 1) {
get_homedir();
tilde_dir = homedir;
tilde_dir = mallocstrcpy(NULL, homedir);
} else {
const struct passwd *userdata;
tilde_dir = mallocstrncpy(NULL, buf, i + 1);
tilde_dir[i] = '\0';
do {
userdata = getpwent();
} while (userdata != NULL &&
(strncmp(userdata->pw_name, buf + 1, i - 1) != 0 ||
strlen(userdata->pw_name) != strnlen(buf + 1, i - 1)));
strcmp(userdata->pw_name, tilde_dir + 1) != 0);
endpwent();
if (userdata != NULL)
tilde_dir = userdata->pw_dir;
tilde_dir = mallocstrcpy(tilde_dir, userdata->pw_dir);
}
if (tilde_dir != NULL) {
dirtmp = charalloc(strlen(tilde_dir) + strlen(buf + i) + 1);
sprintf(dirtmp, "%s%s", tilde_dir, buf + i);
}
}
retval = charalloc(strlen(tilde_dir) + strlen(buf + i) + 1);
sprintf(retval, "%s%s", tilde_dir, buf + i);
/* Set a default value for dirtmp, in case the user's home directory
* isn't found. */
if (dirtmp == NULL)
dirtmp = mallocstrcpy(NULL, buf);
free(tilde_dir);
} else
retval = mallocstrcpy(NULL, buf);
return dirtmp;
return retval;
}
#if !defined(DISABLE_TABCOMP) || !defined(DISABLE_BROWSER)