Deleted Added
sdiff udiff text old ( 15720 ) new ( 15723 )
full compact
day.c (15720) day.c (15723)
1/*
2 * Copyright (c) 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 87 unchanged lines hidden (view full) ---

96 l > 0 && isspace((unsigned char)buf[l - 1]);
97 l--)
98 ;
99 buf[l] = '\0';
100 if (fndays[i].name != NULL)
101 free(fndays[i].name);
102 fndays[i].name = strdup(buf);
103 fndays[i].len = strlen(buf);
1/*
2 * Copyright (c) 1989, 1993, 1994
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 87 unchanged lines hidden (view full) ---

96 l > 0 && isspace((unsigned char)buf[l - 1]);
97 l--)
98 ;
99 buf[l] = '\0';
100 if (fndays[i].name != NULL)
101 free(fndays[i].name);
102 fndays[i].name = strdup(buf);
103 fndays[i].len = strlen(buf);
104#ifdef DEBUG
105 printf("ndays[%d] = %s, fndays[%d] = %s\n",
106 i, ndays[i].name, i, fndays[i].name);
107#endif
108 }
109
110 for (i = 0; i < 12; i++) {
111 tm.tm_mon = i;
112 strftime(buf, sizeof(buf), "%b", &tm);
113 for (l = strlen(buf);
114 l > 0 && isspace((unsigned char)buf[l - 1]);
115 l--)

--- 9 unchanged lines hidden (view full) ---

125 l > 0 && isspace((unsigned char)buf[l - 1]);
126 l--)
127 ;
128 buf[l] = '\0';
129 if (fnmonths[i].name != NULL)
130 free(fnmonths[i].name);
131 fnmonths[i].name = strdup(buf);
132 fnmonths[i].len = strlen(buf);
104 }
105
106 for (i = 0; i < 12; i++) {
107 tm.tm_mon = i;
108 strftime(buf, sizeof(buf), "%b", &tm);
109 for (l = strlen(buf);
110 l > 0 && isspace((unsigned char)buf[l - 1]);
111 l--)

--- 9 unchanged lines hidden (view full) ---

121 l > 0 && isspace((unsigned char)buf[l - 1]);
122 l--)
123 ;
124 buf[l] = '\0';
125 if (fnmonths[i].name != NULL)
126 free(fnmonths[i].name);
127 fnmonths[i].name = strdup(buf);
128 fnmonths[i].len = strlen(buf);
133#ifdef DEBUG
134 printf("nmonths[%d] = %s, fnmonths[%d] = %s\n",
135 i, nmonths[i].name, i, fnmonths[i].name);
136#endif
137 }
138}
139
140void
141settime(now)
142 time_t now;
143{
144 tp = localtime(&now);

--- 27 unchanged lines hidden (view full) ---

172
173 (void)time(&t);
174 tp = localtime(&t);
175
176 len = strlen(date);
177 tm.tm_sec = 0;
178 tm.tm_min = 0;
179 tm.tm_hour = 0;
129 }
130}
131
132void
133settime(now)
134 time_t now;
135{
136 tp = localtime(&now);

--- 27 unchanged lines hidden (view full) ---

164
165 (void)time(&t);
166 tp = localtime(&t);
167
168 len = strlen(date);
169 tm.tm_sec = 0;
170 tm.tm_min = 0;
171 tm.tm_hour = 0;
172 tm.tm_wday = 0;
180 tm.tm_mday = tp->tm_mday;
181 tm.tm_mon = tp->tm_mon;
182 tm.tm_year = tp->tm_year;
183
184
185 /* day */
186 *(date+2) = NULL;
187 tm.tm_mday = atoi(date);

--- 163 unchanged lines hidden (view full) ---

351
352 /* wired */
353 else {
354 day = tp->tm_mday + (((day - 1) - tp->tm_wday + 7) % 7);
355 *varp = 1;
356 }
357 }
358
173 tm.tm_mday = tp->tm_mday;
174 tm.tm_mon = tp->tm_mon;
175 tm.tm_year = tp->tm_year;
176
177
178 /* day */
179 *(date+2) = NULL;
180 tm.tm_mday = atoi(date);

--- 163 unchanged lines hidden (view full) ---

344
345 /* wired */
346 else {
347 day = tp->tm_mday + (((day - 1) - tp->tm_wday + 7) % 7);
348 *varp = 1;
349 }
350 }
351
359#if DEBUG
360 fprintf(stderr, "day2: day %d yday %d\n", day, tp->tm_yday);
361#endif
362 if (!(flags & F_EASTER)) {
363 *monthp = month;
364 *dayp = day;
365 day = cumdays[month] + day;
366 }
367 else {
368 for (v1 = 0; day > cumdays[v1]; v1++)
369 ;
370 *monthp = v1 - 1;
371 *dayp = day - cumdays[v1 - 1];
372 *varp = 1;
373 }
374
352 if (!(flags & F_EASTER)) {
353 *monthp = month;
354 *dayp = day;
355 day = cumdays[month] + day;
356 }
357 else {
358 for (v1 = 0; day > cumdays[v1]; v1++)
359 ;
360 *monthp = v1 - 1;
361 *dayp = day - cumdays[v1 - 1];
362 *varp = 1;
363 }
364
365#if DEBUG
366 fprintf(stderr, "day2: day %d(%d) yday %d\n", *dayp, day, tp->tm_yday);
367#endif
375 /* if today or today + offset days */
376 if (day >= tp->tm_yday - f_dayBefore &&
377 day <= tp->tm_yday + offset + f_dayAfter)
378 return (1);
379
380 /* if number of days left in this year + days to event in next year */
381 if (yrdays - tp->tm_yday + day <= offset + f_dayAfter ||
382 /* a year backward, eg. 6 Jan and 10 days before -> 27. Dec */

--- 95 unchanged lines hidden --- 		368 /* if today or today + offset days */
369 if (day >= tp->tm_yday - f_dayBefore &&
370 day <= tp->tm_yday + offset + f_dayAfter)
371 return (1);
372
373 /* if number of days left in this year + days to event in next year */
374 if (yrdays - tp->tm_yday + day <= offset + f_dayAfter ||
375 /* a year backward, eg. 6 Jan and 10 days before -> 27. Dec */

--- 95 unchanged lines hidden ---