src/usr.bin/ssh/misc.c - diff

Return to misc.c CVS log

Up to [local] / src / usr.bin / ssh

version 1.31, 2005/06/06 11:20:36

version 1.32, 2005/06/17 02:44:32

Line 380

const char *path;

char user[128], ret[MAXPATHLEN];

struct passwd *pw;

int len;

u_int len, slash;

if (*filename != '~')

return (xstrdup(filename));

Line 388

path = strchr(filename, '/');

if (path != NULL && path > filename) { /* ~user/path */

if (path - filename > sizeof(user) - 1)

slash = path - filename;

if (slash > sizeof(user) - 1)

fatal("tilde_expand_filename: ~username too long");

memcpy(user, filename, path - filename);

memcpy(user, filename, slash);

user[path - filename] = '\0';

user[slash] = '\0';

if ((pw = getpwnam(user)) == NULL)

fatal("tilde_expand_filename: No such user %s", user);

} else if ((pw = getpwuid(uid)) == NULL) /* ~/path */

Line 429

Line 430

const char *key;

const char *repl;

} keys[EXPAND_MAX_KEYS];

int num_keys, i, j;

u_int num_keys, i, j;

char buf[4096];

va_list ap;