Attachment #34499 for bug #56039

View | Details | Raw Unified | Return to bug 56039
Collapse All | Expand All

Lines 7-14 Link Here

(-)lang/open-cobol/Makefile (-2 / +3 lines)
7	#	7	#
8		8
9	PORTNAME= open-cobol	9	PORTNAME= open-cobol
10	PORTVERSION= 0.20	10	PORTVERSION= 0.23
11	PORTREVISION= 1
12	CATEGORIES= lang	11	CATEGORIES= lang
13	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}	12	MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
14	MASTER_SITE_SUBDIR= ${PORTNAME}	13	MASTER_SITE_SUBDIR= ${PORTNAME}
Lines 26-30 Link Here
26	LDFLAGS="-L${LOCALBASE}/lib -lintl"	25	LDFLAGS="-L${LOCALBASE}/lib -lintl"
27	CONFIGURE_ARGS= --with-readline	26	CONFIGURE_ARGS= --with-readline
28	INSTALLS_SHLIB= yes	27	INSTALLS_SHLIB= yes
		28
		29	INFO= open-cobol
29		30
30	.include <bsd.port.mk>	31	.include <bsd.port.mk>

Line 1 Link Here

(-)lang/open-cobol/distinfo (-1 / +1 lines)
1	MD5 (open-cobol-0.20.tar.gz) = ce698bbac587bba95fb43e38e239db5e	1	MD5 (open-cobol-0.23.tar.gz) = a253ca8965dd071c517d3860e9730137




--- libcob/fileio.c.orig	Wed Jun 11 15:40:20 2003
+++ libcob/fileio.c	Wed Aug 27 09:57:31 2003
@@ -202,13 +202,10 @@
   else
     {
       /* discard input until the next newline */
-      int c = getc (f->file);
-      while (c != '\r' && c != '\n' && c != EOF)
-	c = getc (f->file);
-      if (c == '\r')
-	c = getc (f->file);
-      if (c != '\n' && c != EOF)
-	ungetc (c, f->file);
+      char buff[BUFSIZ];
+      while (fgets (buff, BUFSIZ, f->file) !=NULL)
+	if (strchr (buff, '\n') != NULL)
+	  break;
     }
 
   memcpy (f->record->data, buff, f->record->size);

Lines 1-4 Link Here

(-)lang/open-cobol/pkg-plist (-4 lines)
1	@comment $FreeBSD: ports/lang/open-cobol/pkg-plist,v 1.5 2003/04/28 23:54:38 naddy Exp $
2	bin/cob-config	1	bin/cob-config
3	bin/cobc	2	bin/cobc
4	etc/libcob.conf	3	etc/libcob.conf
Lines 12-20 Link Here
12	include/libcob/screenio.h	11	include/libcob/screenio.h
13	include/libcob/strings.h	12	include/libcob/strings.h
14	include/libcob/termio.h	13	include/libcob/termio.h
15	@unexec install-info --delete %D/info/open-cobol.info %D/info/dir
16	info/open-cobol.info
17	@exec install-info %D/info/open-cobol.info %D/info/dir
18	lib/libcob.a	14	lib/libcob.a
19	lib/libcob.so	15	lib/libcob.so
20	lib/libcob.so.1	16	lib/libcob.so.1

Return to bug 56039

Line 0 Link Here

(-)lang/open-cobol/files/patch-libcob::fileio.c (+20 lines)
	1	--- libcob/fileio.c.orig Wed Jun 11 15:40:20 2003
	2	+++ libcob/fileio.c Wed Aug 27 09:57:31 2003
	3	@@ -202,13 +202,10 @@
	4	else
	5	{
	6	/* discard input until the next newline */
	7	- int c = getc (f->file);
	8	- while (c != '\r' && c != '\n' && c != EOF)
	9	- c = getc (f->file);
	10	- if (c == '\r')
	11	- c = getc (f->file);
	12	- if (c != '\n' && c != EOF)
	13	- ungetc (c, f->file);
	14	+ char buff[BUFSIZ];
	15	+ while (fgets (buff, BUFSIZ, f->file) !=NULL)
	16	+ if (strchr (buff, '\n') != NULL)
	17	+ break;
	18	}
	19
	20	memcpy (f->record->data, buff, f->record->size);