src/usr.bin/rdist/expand.c - diff

Return to expand.c CVS log

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

Diff for /src/usr.bin/rdist/expand.c between version 1.8 and 1.9

version 1.8, 2003/04/05 20:31:58

version 1.9, 2003/04/19 17:22:29

Line 144

which = wh;

path = tpathp = pathp = pathbuf;

*pathp = CNULL;

lastpathp = &path[sizeof pathbuf - 2];

lastpathp = &pathbuf[sizeof pathbuf - 2];

tilde = "";

eargc = 0;

eargv = sortbase = argvbuf;

Line 292

if (pw == NULL || strcmp(pw->pw_name,

(char *)ebuf+1) != 0) {

if ((pw = getpwnam((char *)ebuf+1)) == NULL) {

strcat((char *)ebuf,

strlcat((char *)ebuf,

": unknown user name");

": unknown user name",

sizeof(ebuf));

yyerror((char *)ebuf+1);

return;

}

Line 399

Line 400

if (which & E_TILDE)

Cat((u_char *)path, (u_char *)dp->d_name);

else {

(void) strcpy(pathp, dp->d_name);

(void) strlcpy(pathp, dp->d_name,

lastpathp - pathp + 2);

Cat((u_char *)tilde, (u_char *)tpathp);

*pathp = CNULL;

}

Line 410

Line 412

patherr1:

closedir(dirp);

patherr2:

(void) strcat(path, ": ");

(void) strlcat(path, ": ", lastpathp - path + 2);

(void) strcat(path, SYSERR);

(void) strlcat(path, SYSERR, lastpathp - path + 2);

yyerror(path);

}

Line 478

Line 480

doit:

savec = *pm;

*pm = 0;

(void) strcpy((char *)lm, (char *)pl);

*lm = 0;

(void) strlcat((char *)restbuf, (char *)pl,

sizeof restbuf);

(void) strlcat((char *)restbuf, (char *)pe + 1,

sizeof restbuf);

*pm = savec;