mirror of
https://git.freebsd.org/ports.git
synced 2025-06-07 22:00:31 -04:00
98228699b1
Switch to more recent fork made by Valentin Abramov, it is much improved in calculation (new ephemeris used), have many bugfixes and some new features. Fixes from me: integrate our fixes for original version fix some out of memory / junk memory accesses avoid text clipping on long lines add seconds precision to zone offset (for true local time) add missing color reset in one place
51 lines
1.6 KiB
C
51 lines
1.6 KiB
C
--- io.c.orig 2002-04-27 22:35:30.000000000 +0400
|
|
+++ io.c 2012-02-26 11:44:42.000000000 +0400
|
|
@@ -38,6 +38,7 @@
|
|
** Modifications from version 5.40 to 5.41 are by Alois Treindl.
|
|
*/
|
|
|
|
+#include <ctype.h>
|
|
#include "astrolog.h"
|
|
#include <string.h>
|
|
/*
|
|
@@ -141,12 +142,12 @@
|
|
}
|
|
|
|
loop {
|
|
- while (!feof(file) && (ch = getc(file)) < ' ')
|
|
+ while (!feof(file) && iscntrl((_char)(ch = getc(file))))
|
|
;
|
|
if (feof(file))
|
|
break;
|
|
for (szLine[0] = ch, i = 1; i < cchSzMax && !feof(file) &&
|
|
- (szLine[i] = getc(file)) >= ' '; i++)
|
|
+ !iscntrl((_char)(szLine[i] = getc(file))); i++)
|
|
;
|
|
szLine[i] = chNull;
|
|
argc = NParseCommandLine(szLine, argv);
|
|
@@ -432,7 +433,7 @@
|
|
/* so we have to distinguish them from new strings with two dots. VA. */
|
|
|
|
newstyle = fTrue;
|
|
- if (pm == pmTim || pm == pmLon || pm == pmLat) {
|
|
+ if (pm == pmTim || pm == pmLon || pm == pmLat || pm == pmZon) {
|
|
havedot = 0; dot1 = 0; dot2 = 0;
|
|
for (i = 0; i < cch; i++) {
|
|
chdot = sz[i];
|
|
@@ -453,6 +454,7 @@
|
|
/* it to the old style. */
|
|
|
|
if (newstyle) {
|
|
+ memset(minutes, chNull, sizeof(minutes));
|
|
for (i = dot1+1; i < cch; i++) {
|
|
j = i - (dot1 + 1);
|
|
if (sz[i] >= '.' && sz[i] <= '9' && sz[i] != '/')
|
|
@@ -724,7 +726,7 @@
|
|
/* them. Be prepared to skip over them in old files for compatibility. */
|
|
|
|
if (i == oVtx) {
|
|
- while (getc(file) >= ' ')
|
|
+ while (!iscntrl((_char)getc(file)))
|
|
;
|
|
if ((ch = getc(file)) != 'H')
|
|
i = cuspHi;
|