sh.c (tcsh-6.22.02) | : | sh.c (tcsh-6.22.03) | ||
---|---|---|---|---|
skipping to change at line 181 | skipping to change at line 181 | |||
char *new, *new_p; | char *new, *new_p; | |||
size_t len; | size_t len; | |||
int add_LOC = 1; | int add_LOC = 1; | |||
int add_lang = 1; | int add_lang = 1; | |||
char trypath[MAXPATHLEN]; | char trypath[MAXPATHLEN]; | |||
struct stat st; | struct stat st; | |||
if (path == NULL) | if (path == NULL) | |||
return; | return; | |||
(void) xsnprintf(trypath, sizeof(trypath), "%s/en/LC_MESSAGES/tcsh.cat", | (void) xsnprintf(trypath, sizeof(trypath), "%s/C/LC_MESSAGES/tcsh.cat", | |||
path); | path); | |||
if (stat(trypath, &st) == -1) | if (stat(trypath, &st) == -1) | |||
return; | return; | |||
if ((old = getenv("NLSPATH")) != NULL) | if ((old = getenv("NLSPATH")) != NULL) | |||
len = strlen(old) + 1; /* don't forget the colon. */ | len = strlen(old) + 1; /* don't forget the colon. */ | |||
else | else | |||
len = 0; | len = 0; | |||
len += 2 * strlen(path) + | len += 2 * strlen(path) + | |||
skipping to change at line 1830 | skipping to change at line 1830 | |||
xexit(getn(varval(STRstatus))); | xexit(getn(varval(STRstatus))); | |||
} | } | |||
/* | /* | |||
* in the event of a HUP we want to save the history | * in the event of a HUP we want to save the history | |||
*/ | */ | |||
void | void | |||
phup(void) | phup(void) | |||
{ | { | |||
static int again = 0; | ||||
if (again++) | ||||
return; | ||||
if (loginsh) { | if (loginsh) { | |||
setcopy(STRlogout, STRhangup, VAR_READWRITE); | setcopy(STRlogout, STRhangup, VAR_READWRITE); | |||
#ifdef _PATH_DOTLOGOUT | #ifdef _PATH_DOTLOGOUT | |||
(void) srcfile(_PATH_DOTLOGOUT, 0, 0, NULL); | (void) srcfile(_PATH_DOTLOGOUT, 0, 0, NULL); | |||
#endif | #endif | |||
if (adrof(STRhome)) | if (adrof(STRhome)) | |||
(void) srccat(varval(STRhome), STRsldtlogout); | (void) srccat(varval(STRhome), STRsldtlogout); | |||
} | } | |||
record(); | record(); | |||
skipping to change at line 2505 | skipping to change at line 2509 | |||
# endif | # endif | |||
#endif | #endif | |||
*blkp = NULL; | *blkp = NULL; | |||
return (blk); | return (blk); | |||
} | } | |||
#endif | #endif | |||
static void | static void | |||
record(void) | record(void) | |||
{ | { | |||
static int again = 0; | ||||
int ophup_disabled; | ||||
if (again++) | ||||
return; | ||||
ophup_disabled = phup_disabled; | ||||
phup_disabled = 1; | ||||
if (!fast) { | if (!fast) { | |||
recdirs(NULL, adrof(STRsavedirs) != NULL); | recdirs(NULL, adrof(STRsavedirs) != NULL); | |||
rechist(NULL, adrof(STRsavehist) != NULL); | rechist(NULL, adrof(STRsavehist) != NULL); | |||
} | } | |||
displayHistStats("Exiting"); /* no-op unless DEBUG_HIST */ | displayHistStats("Exiting"); /* no-op unless DEBUG_HIST */ | |||
phup_disabled = ophup_disabled; | ||||
} | } | |||
/* | /* | |||
* Grab the tty repeatedly, and give up if we are not in the correct | * Grab the tty repeatedly, and give up if we are not in the correct | |||
* tty process group. | * tty process group. | |||
*/ | */ | |||
int | int | |||
grabpgrp(int fd, pid_t desired) | grabpgrp(int fd, pid_t desired) | |||
{ | { | |||
struct sigaction old; | struct sigaction old; | |||
End of changes. 4 change blocks. | ||||
1 lines changed or deleted | 14 lines changed or added |