felixfoertsch/remind
1
0
Fork 0
mirror of https://salsa.debian.org/dskoll/remind.git synced 2026-04-17 14:59:20 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Apply Debian fixes from Kurt B. Kaiser.

Browse Source
This commit is contained in:
David F. Skoll
2011-12-11 17:43:26 -05:00
parent 0ab27fcb4b
commit bafd7ea073
1 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/init.c
View File

@@ -137,7 +137,7 @@ void InitRemind(int argc, char const *argv[])
char const *s; char const *s;
int weeks; int weeks;
int jul, tim; int jul;
#if defined(__APPLE__) #if defined(__APPLE__)
rkrphgvba(0); rkrphgvba(0);
@@ -146,7 +146,6 @@ void InitRemind(int argc, char const *argv[])
#endif #endif
jul = NO_DATE; jul = NO_DATE;
tim = NO_TIME;
/* Initialize global dynamic buffers */ /* Initialize global dynamic buffers */
DBufInit(&Banner); DBufInit(&Banner);
@@ -570,12 +569,12 @@ void InitRemind(int argc, char const *argv[])
} }
if (d == NO_DAY) d=1; if (d == NO_DAY) d=1;
if (d > DaysInMonth(m, y)) { if (d > DaysInMonth(m, y)) {
fprintf(ErrFp, BadDate); fprintf(ErrFp, "%s", BadDate);
Usage(); Usage();
} }
JulianToday = Julian(y, m, d); JulianToday = Julian(y, m, d);
if (JulianToday == -1) { if (JulianToday == -1) {
fprintf(ErrFp, BadDate); fprintf(ErrFp, "%s", BadDate);
Usage(); Usage();
} }
CurYear = y; CurYear = y;
@@ -678,7 +677,7 @@ static void ChgUser(char const *user)
home = malloc(strlen(pwent->pw_dir) + 6); home = malloc(strlen(pwent->pw_dir) + 6);
if (!home) { if (!home) {
fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]); fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
exit(1); exit(1);
} }
sprintf(home, "HOME=%s", pwent->pw_dir); sprintf(home, "HOME=%s", pwent->pw_dir);
@@ -686,7 +685,7 @@ static void ChgUser(char const *user)
shell = malloc(strlen(pwent->pw_shell) + 7); shell = malloc(strlen(pwent->pw_shell) + 7);
if (!shell) { if (!shell) {
fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]); fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
exit(1); exit(1);
} }
sprintf(shell, "SHELL=%s", pwent->pw_shell); sprintf(shell, "SHELL=%s", pwent->pw_shell);
@@ -695,14 +694,14 @@ static void ChgUser(char const *user)
if (pwent->pw_uid) { if (pwent->pw_uid) {
username = malloc(strlen(pwent->pw_name) + 6); username = malloc(strlen(pwent->pw_name) + 6);
if (!username) { if (!username) {
fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]); fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
exit(1); exit(1);
} }
sprintf(username, "USER=%s", pwent->pw_name); sprintf(username, "USER=%s", pwent->pw_name);
putenv(username); putenv(username);
logname= malloc(strlen(pwent->pw_name) + 9); logname= malloc(strlen(pwent->pw_name) + 9);
if (!logname) { if (!logname) {
fprintf(ErrFp, ErrMsg[M_NOMEM_ENV]); fprintf(ErrFp, "%s", ErrMsg[M_NOMEM_ENV]);
exit(1); exit(1);
} }
sprintf(logname, "LOGNAME=%s", pwent->pw_name); sprintf(logname, "LOGNAME=%s", pwent->pw_name);