src/usr.bin/less/filename.c - diff

Return to filename.c CVS log

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

Diff for /src/usr.bin/less/filename.c between version 1.3 and 1.4

version 1.3, 2001/11/19 19:02:14

version 1.4, 2003/03/13 09:09:32

Line 51

char *filename;

{

char *pathname;

int f;

int f, len;

if (dirname == NULL || *dirname == '\0')

return (NULL);

* Construct the full pathname.

pathname = (char *) calloc(strlen(dirname) + strlen(filename) + 2,

len = strlen(dirname) + strlen(filename) + 2;

sizeof(char));

pathname = (char *) calloc(len, sizeof(char));

if (pathname == NULL)

return (NULL);

#if MSOFTC || OS2

sprintf(pathname, "%s\\%s", dirname, filename);

#else

sprintf(pathname, "%s/%s", dirname, filename);

snprintf(pathname, len, "%s/%s", dirname, filename);

#endif

* Make sure the file exists.

Line 239

sprintf(fpat, "%s*", s);

#else

fpat = (char *) ecalloc(strlen(s)+2, sizeof(char));

sprintf(fpat, "%s*", s);

snprintf(fpat, strlen(s)+2, "%s*", s);

#endif

s = glob(fpat);

if (strcmp(s,fpat) == 0)

Line 360

(s1 == NULL ? 0 : strlen(s1)) +

(s2 == NULL ? 0 : strlen(s2)) + 1;

scmd = (char *) ecalloc(len, sizeof(char));

sprintf(scmd, cmd, s1, s2);

snprintf(scmd, len, cmd, s1, s2);

#if HAVE_SHELL

shell = getenv("SHELL");

if (shell != NULL && *shell != '\0')

Line 368

* Read the output of <$SHELL -c "cmd">.

scmd2 = (char *) ecalloc(strlen(shell) + strlen(scmd) + 7,

len = strlen(shell) + strlen(scmd) + 7;

sizeof(char));

scmd2 = (char *) ecalloc(len, sizeof(char));

sprintf(scmd2, "%s -c \"%s\"", shell, scmd);

snprintf(scmd2, len, "%s -c \"%s\"", shell, scmd);

free(scmd);

scmd = scmd2;

}