Allow 8bit chars be read from file

This commit is contained in:
Andrey A. Chernov 2007-06-26 11:49:51 +00:00
parent a0718a37fa
commit 00cd032941
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=194291
3 changed files with 46 additions and 3 deletions

View file

@ -10,7 +10,7 @@
PORTNAME= astrolog
PORTVERSION= 5.40
PORTREVISION= 7
PORTREVISION= 8
CATEGORIES= misc
MASTER_SITES= http://www.astrolog.org/ftp/ephem/:ephem \
http://www.astrolog.org/ftp/:dist

View file

@ -1,5 +1,5 @@
--- astrolog.c.orig 1998-12-23 23:29:07.000000000 +0300
+++ astrolog.c 2007-06-23 18:07:49.000000000 +0400
--- astrolog.c.orig 1998-12-23 23:29:03.000000000 +0300
+++ astrolog.c 2007-06-26 15:44:04.000000000 +0400
@@ -35,6 +35,7 @@
** Last code change made 12/20/1998.
*/
@ -8,6 +8,15 @@
#include "astrolog.h"
@@ -234,7 +235,7 @@
char *pch = szLine;
/* Split the entered line up into its individual switch strings. */
- while (*pch >= ' ' || *pch == chTab) {
+ while (!iscntrl((_char)*pch) || *pch == chTab) {
if (*pch == ' ' || *pch == chTab) {
if (fSpace)
/* Skip over the current run of spaces between strings. */
@@ -1146,8 +1147,18 @@
case 'z':
if (ch1 == '0') {

View file

@ -0,0 +1,34 @@
--- io.c.orig 1998-12-23 23:29:21.000000000 +0300
+++ io.c 2007-06-26 15:35:03.000000000 +0400
@@ -35,6 +35,7 @@
** Last code change made 12/20/1998.
*/
+#include <ctype.h>
#include "astrolog.h"
@@ -139,12 +140,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);
@@ -675,7 +676,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;