Date: Mon, 23 Aug 2010 22:21:37 +0000 (UTC) From: Edwin Groothuis <edwin@FreeBSD.org> To: src-committers@freebsd.org, svn-src-user@freebsd.org Subject: svn commit: r211724 - in user/edwin/calendar: . calendars calendars/ru_RU.KOI8-R Message-ID: <201008232221.o7NMLbqM055340@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: edwin Date: Mon Aug 23 22:21:37 2010 New Revision: 211724 URL: http://svn.freebsd.org/changeset/base/211724 Log: Merge with head to revision r211721 Modified: user/edwin/calendar/calendars/calendar.dutch user/edwin/calendar/calendars/calendar.freebsd user/edwin/calendar/calendars/calendar.history user/edwin/calendar/calendars/ru_RU.KOI8-R/calendar.common (contents, props changed) user/edwin/calendar/io.c user/edwin/calendar/locale.c user/edwin/calendar/parsedata.c user/edwin/calendar/sunpos.c Directory Properties: user/edwin/calendar/ (props changed) Modified: user/edwin/calendar/calendars/calendar.dutch ============================================================================== --- user/edwin/calendar/calendars/calendar.dutch Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/calendars/calendar.dutch Mon Aug 23 22:21:37 2010 (r211724) @@ -18,7 +18,7 @@ mei/01 Dag van de Arbeid mei/04 Dodenherdenking mei/05 Bevrijdingsdag okt/04 Dierendag -nov/01 Allerheilingen +nov/01 Allerheiligen nov/02 Allerzielen nov/11 Sint Maarten nov/11 Elfde-van-de-elfde Modified: user/edwin/calendar/calendars/calendar.freebsd ============================================================================== --- user/edwin/calendar/calendars/calendar.freebsd Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/calendars/calendar.freebsd Mon Aug 23 22:21:37 2010 (r211724) @@ -72,6 +72,7 @@ 03/03 Doug White <dwhite@FreeBSD.org> born in Eugene, Oregon, United States, 1977 03/03 Gordon Tetlow <gordon@FreeBSD.org> born in Reno, Nevada, United States, 1978 03/04 Oleksandr Tymoshenko <gonzo@FreeBSD.org> born in Chernihiv, Ukraine, 1980 +03/05 Baptiste Daroussin <bapt@FreeBSD.org> born in Beauvais, France, 1980 03/05 Philip Paeps <philip@FreeBSD.org> born in Leuven, Belgium, 1983 03/05 Ulf Lilleengen <lulf@FreeBSD.org> born in Hamar, Norway, 1985 03/06 Christopher Piazza <cpiazza@FreeBSD.org> born in Kamloops, British Columbia, Canada, 1981 @@ -82,6 +83,7 @@ 03/12 Greg Lewis <glewis@FreeBSD.org> born in Adelaide, South Australia, Australia, 1969 03/13 Alexander Leidinger <netchild@FreeBSD.org> born in Neunkirchen, Saarland, Germany, 1976 03/13 Will Andrews <will@FreeBSD.org> born in Pontiac, Michigan, United States, 1982 +03/14 Bernhard Froehlich <decke@FreeBSD.org> born in Graz, Styria, Austria, 1985 03/15 Paolo Pisati <piso@FreeBSD.org> born in Lodi, Italy, 1977 03/15 Brian Fundakowski Feldman <green@FreeBSD.org> born in Alexandria, Virginia, United States, 1983 03/17 Michael Smith <msmith@FreeBSD.org> born in Bankstown, New South Wales, Australia, 1971 @@ -91,6 +93,7 @@ 03/20 MANTANI Nobutaka <nobutaka@FreeBSD.org> born in Hiroshima, Japan, 1978 03/20 Cameron Grant <cg@FreeBSD.org> died in Hemel Hempstead, United Kingdom, 2005 03/20 Henrik Brix Andersen <brix@FreeBSD.org> born in Aarhus, Denmark, 1978 +03/20 Joseph S. Atkinson <jsa@FreeBSD.org> born in Batesville, Arkansas, United States, 1977 03/22 Brad Davis <brd@FreeBSD.org> born in Farmington, New Mexico, United States, 1983 03/23 Daniel C. Sobral <dcs@FreeBSD.org> born in Brasilia, Distrito Federal, Brazil, 1971 03/23 Benno Rice <benno@FreeBSD.org> born in Adelaide, South Australia, Australia, 1977 @@ -198,6 +201,7 @@ 07/19 Masafumi NAKANE <max@FreeBSD.org> born in Okazaki, Aichi, Japan, 1972 07/19 Simon L. Nielsen <simon@FreeBSD.org> born in Copenhagen, Denmark, 1980 07/19 Gleb Smirnoff <glebius@FreeBSD.org> born in Kharkov, USSR, 1981 +07/20 Andrey V. Elsukov <ae@FreeBSD.org> born in Kotelnich, Russian Federation, 1981 07/22 James Housley <jeh@FreeBSD.org> born in Chicago, Illinois, United States, 1965 07/22 Jens Schweikhardt <schweikh@FreeBSD.org> born in Waiblingen, Baden-Wuerttemberg, Germany, 1967 07/22 Lukas Ertl <le@FreeBSD.org> born in Weissenbach/Enns, Steiermark, Austria, 1976 @@ -247,6 +251,7 @@ 09/12 Benedict Christopher Reuschling <bcr@FreeBSD.org> born in Darmstadt, Germany, 1981 09/15 Dima Panov <fluffy@FreeBSD.org> born in Khabarovsk, Russian Federation, 1978 09/17 Maxim Bolotin <mb@FreeBSD.org> born in Rostov-on-Don, Russian Federation, 1976 +09/18 Matthew Fleming <mdf@FreeBSD.org> born in Cleveland, Ohio, United States, 1975 09/20 Kevin Lo <kevlo@FreeBSD.org> born in Taipei, Taiwan, Republic of China, 1972 09/27 Neil Blakey-Milner <nbm@FreeBSD.org> born in Port Elizabeth, South Africa, 1978 09/27 Renato Botelho <garga@FreeBSD.org> born in Araras, Sao Paulo, Brazil, 1979 @@ -279,6 +284,7 @@ 11/10 Gregory Neil Shapiro <gshapiro@FreeBSD.org> born in Providence, Rhode Island, United States, 1970 11/13 John Baldwin <jhb@FreeBSD.org> born in Stuart, Virginia, United States, 1977 11/15 Lars Engels <lme@FreeBSD.org> born in Hilden, Nordrhein-Westfalen, Germany, 1980 +11/15 Tijl Coosemans <tijl@FreeBSD.org> born in Duffel, Belgium, 1983 11/16 Jose Maria Alcaide Salinas <jmas@FreeBSD.org> born in Madrid, Spain, 1962 11/17 Ralf S. Engelschall <rse@FreeBSD.org> born in Dachau, Bavaria, Germany, 1972 11/18 Thomas Quinot <thomas@FreeBSD.org> born in Paris, France, 1977 Modified: user/edwin/calendar/calendars/calendar.history ============================================================================== --- user/edwin/calendar/calendars/calendar.history Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/calendars/calendar.history Mon Aug 23 22:21:37 2010 (r211724) @@ -80,7 +80,6 @@ 03/15 Watts, Los Angeles, riots kill two, injure 25, 1966 03/15 Ides of March. Gaius Julius Caesar assassinated by senators, including adoptive son Marcus Junius Brutus Caepio, 44BC -03/16 First liquid-fuel-powered rocket flight, 1926 03/16 MyLai Massacre; 300 non-combatant villagers killed by US infantrymen 03/16 Robert Goddard launches first liquid-fueled rocket, Auburn MA, 1926 03/17 Vanguard I launched, 1958. Earth proved pear-shaped Modified: user/edwin/calendar/calendars/ru_RU.KOI8-R/calendar.common ============================================================================== --- user/edwin/calendar/calendars/ru_RU.KOI8-R/calendar.common Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/calendars/ru_RU.KOI8-R/calendar.common Mon Aug 23 22:21:37 2010 (r211724) @@ -18,6 +18,7 @@ LANG=ru_RU.KOI8-R 10 фев День дипломатического работника 1 мар Всемирный день гражданской обороны 03/SunSecond День работников геодезии и картографии +11 мар День работника органов наркоконтроля 18 мар День налоговой полиции 03/SunThird День работников торговли, бытового обслуживания населения и жилищно-коммунального хозяйства 27 мар Международный день театра @@ -33,22 +34,28 @@ LANG=ru_RU.KOI8-R 17 май Международный день телекоммуникаций 18 май Международный день музеев 24 май День славянской письменности и культуры +26 май День российского предпринимательства 27 май Общероссийский день библиотек 28 май День пограничника +30 май День пожарной охраны +31 май День Российской Адвокатуры 05/SunLast День химика 1 июн День защиты детей + 5 июн День эколога 6 июн Пушкинский день 8 июн День социального работника 06/SunSecond День работников легкой промышленности 06/SunThird День медицинского работника 22 июн День памяти и скорби (Начало Великой Отечественной Войны, 1941 год) 27 июн День молодежи +29 июн День партизан и подпольщиков 06/SatLast День изобретателя и рационализатора 07/SunFirst День работников морского и речного флота 07/SunSecond День рыбака 07/SunSecond День российской почты 07/SunThird День металлурга 07/SunLast День Военно-Морского Флота +28 июл День крещения Руси 6 авг День железнодорожных войск 08/SunFirst День железнодорожника 12 авг День военно-воздушных сил @@ -59,12 +66,16 @@ LANG=ru_RU.KOI8-R 08/SunLast День шахтера 1 сен День знаний 2 сен День российской гвардии + 3 сен День солидарности в борьбе с терроризмом + 4 сен День специалиста по ядерному обеспечению 09/SunFirst День работников нефтяной и газовой промышленности 09/SunSecond День танкиста 09/SunThird День работников леса +28 сен День работника атомной промышленности 09/SunLast День машиностроителя 1 окт День пожилых людей - 4 окт День военно-космических сил + 1 окт День сухопутных войск + 4 окт День космических войск 5 окт День учителя 14 окт Международный день стандартизации 10/SunSecond День работников сельского хозяйства и перерабатывающей промышленности @@ -73,15 +84,19 @@ LANG=ru_RU.KOI8-R 25 окт День таможенника 30 окт День памяти жертв политических репрессий 10/SunLast День работников автомобильного транспорта + 7 ноя День октябрьской революции 1917 года 9 ноя Всемирный день качества 10 ноя День милиции 16 ноя День морской пехоты 17 ноя Международный день студентов -11/SunThird День ракетных войск и артиллерии +19 ноя День ракетных войск и артиллерии 21 ноя День работников налоговых органов 26 ноя Всемирный день информации 11/SunLast День матери 1 дек Всемирный день борьбы со СПИДом + 3 дек День юриста + 9 дек День Героев Отечества +12 дек День Конституции 17 дек День ракетных войск стратегического назначения 20 дек День работника органов безопасности 22 дек День энергетика Modified: user/edwin/calendar/io.c ============================================================================== --- user/edwin/calendar/io.c Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/io.c Mon Aug 23 22:21:37 2010 (r211724) @@ -107,8 +107,10 @@ cal(void) tm.tm_wday = 0; count = 0; - if ((fp = opencal()) == NULL) + if ((fp = opencal()) == NULL) { + free(extradata); return; + } while (fgets(buf, sizeof(buf), stdin) != NULL) { if ((pp = strchr(buf, '\n')) != NULL) *pp = '\0'; @@ -155,15 +157,15 @@ cal(void) } /* Get rid of leading spaces (non-standard) */ - while (isspace(buf[0])) - memcpy(buf, buf + 1, strlen(buf) - 1); + while (isspace((unsigned char)buf[0])) + memcpy(buf, buf + 1, strlen(buf)); /* No tab in the line, then not a valid line */ if ((pp = strchr(buf, '\t')) == NULL) continue; /* Trim spaces in front of the tab */ - while (isspace(pp[-1])) + while (isspace((unsigned char)pp[-1])) pp--; p = *pp; @@ -203,6 +205,7 @@ cal(void) event_print_all(fp); closecal(fp); + free(extradata); } FILE * @@ -226,7 +229,8 @@ opencal(void) char *home = getenv("HOME"); if (home == NULL || *home == '\0') errx(1, "cannot get home directory"); - chdir(home); + if (chdir(home) != 0) + errx(1, "cannot enter home directory"); for (found = i = 0; i < sizeof(calendarHomes) / sizeof(calendarHomes[0]); i++) if (chdir(calendarHomes[i]) == 0 && Modified: user/edwin/calendar/locale.c ============================================================================== --- user/edwin/calendar/locale.c Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/locale.c Mon Aug 23 22:21:37 2010 (r211724) @@ -76,6 +76,7 @@ setnnames(void) int i, l; struct tm tm; + memset(&tm, 0, sizeof(struct tm)); for (i = 0; i < 7; i++) { tm.tm_wday = i; strftime(buf, sizeof(buf), "%a", &tm); @@ -103,6 +104,7 @@ setnnames(void) fndays[i].len = strlen(buf); } + memset(&tm, 0, sizeof(struct tm)); for (i = 0; i < 12; i++) { tm.tm_mon = i; strftime(buf, sizeof(buf), "%b", &tm); @@ -141,12 +143,12 @@ setnsequences(char *seq) for (i = 0; i < 5; i++) { nsequences[i].name = p; if ((p = strchr(p, ' ')) == NULL) { + /* Oh oh there is something wrong. Erase! Erase! */ for (i = 0; i < 5; i++) { nsequences[i].name = NULL; nsequences[i].len = 0; - return; } - + return; } *p = '\0'; p++; Modified: user/edwin/calendar/parsedata.c ============================================================================== --- user/edwin/calendar/parsedata.c Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/parsedata.c Mon Aug 23 22:21:37 2010 (r211724) @@ -872,7 +872,7 @@ isonlydigits(char *s, int nostar) for (i = 0; s[i] != '\0'; i++) { if (nostar == 0 && s[i] == '*' && s[i + 1] == '\0') return 1; - if (!isdigit(s[i])) + if (!isdigit((unsigned char)s[i])) return (0); } return (1); Modified: user/edwin/calendar/sunpos.c ============================================================================== --- user/edwin/calendar/sunpos.c Mon Aug 23 22:09:25 2010 (r211723) +++ user/edwin/calendar/sunpos.c Mon Aug 23 22:21:37 2010 (r211724) @@ -226,26 +226,24 @@ fequinoxsolstice(int year, double UTCoff * It happens when the returned value "dec" goes from * [350 ... 360> -> [0 ... 10] */ - found = 0; - prevdec = 350; for (d = 18; d < 31; d++) { -// printf("Comparing day %d to %d.\n", d, d+1); + /* printf("Comparing day %d to %d.\n", d, d+1); */ sunpos(year, 3, d, UTCoffset, 0, 0, 0, 0.0, 0.0, &L, &decleft); sunpos(year, 3, d + 1, UTCoffset, 0, 0, 0, 0.0, 0.0, &L, &decright); -// printf("Found %g and %g.\n", decleft, decright); + /* printf("Found %g and %g.\n", decleft, decright); */ if (SIGN(decleft) == SIGN(decright)) continue; dial = SECSPERDAY; s = SECSPERDAY / 2; while (s > 0) { -// printf("Obtaining %d (%02d:%02d)\n", -// dial, SHOUR(dial), SMIN(dial)); + /* printf("Obtaining %d (%02d:%02d)\n", + dial, SHOUR(dial), SMIN(dial)); */ sunpos(year, 3, d, UTCoffset, SHOUR(dial), SMIN(dial), SSEC(dial), 0.0, 0.0, &L, &decmiddle); -// printf("Found %g\n", decmiddle); + /* printf("Found %g\n", decmiddle); */ if (SIGN(decleft) == SIGN(decmiddle)) { decleft = decmiddle; dial += s; @@ -253,7 +251,9 @@ fequinoxsolstice(int year, double UTCoff decright = decmiddle; dial -= s; } -// printf("New boundaries: %g - %g\n", decleft, decright); + /* + printf("New boundaries: %g - %g\n", decleft, decright); + */ s /= 2; } @@ -265,26 +265,24 @@ fequinoxsolstice(int year, double UTCoff * It happens when the returned value "dec" goes from * [10 ... 0] -> <360 ... 350] */ - found = 0; - prevdec = 10; for (d = 18; d < 31; d++) { -// printf("Comparing day %d to %d.\n", d, d+1); + /* printf("Comparing day %d to %d.\n", d, d+1); */ sunpos(year, 9, d, UTCoffset, 0, 0, 0, 0.0, 0.0, &L, &decleft); sunpos(year, 9, d + 1, UTCoffset, 0, 0, 0, 0.0, 0.0, &L, &decright); -// printf("Found %g and %g.\n", decleft, decright); + /* printf("Found %g and %g.\n", decleft, decright); */ if (SIGN(decleft) == SIGN(decright)) continue; dial = SECSPERDAY; s = SECSPERDAY / 2; while (s > 0) { -// printf("Obtaining %d (%02d:%02d)\n", -// dial, SHOUR(dial), SMIN(dial)); + /* printf("Obtaining %d (%02d:%02d)\n", + dial, SHOUR(dial), SMIN(dial)); */ sunpos(year, 9, d, UTCoffset, SHOUR(dial), SMIN(dial), SSEC(dial), 0.0, 0.0, &L, &decmiddle); -// printf("Found %g\n", decmiddle); + /* printf("Found %g\n", decmiddle); */ if (SIGN(decleft) == SIGN(decmiddle)) { decleft = decmiddle; dial += s; @@ -292,7 +290,9 @@ fequinoxsolstice(int year, double UTCoff decright = decmiddle; dial -= s; } -// printf("New boundaries: %g - %g\n", decleft, decright); + /* + printf("New boundaries: %g - %g\n", decleft, decright); + */ s /= 2; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201008232221.o7NMLbqM055340>