cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename getline, drop USE_GROFF, more exact license marker

Browse Source
This commit is contained in:
sthen 2012-03-16 22:01:37 +00:00
parent aba3e2ad42
commit 3b1137aabe
2 changed files with 53 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
www/ffproxy/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2010/11/22 08:36:48 espie Exp $
# $OpenBSD: Makefile,v 1.13 2012/03/16 22:01:37 sthen Exp $
COMMENT= filtering HTTP proxy server
DISTNAME= ffproxy-1.6
REVISION= 0
REVISION= 1
CATEGORIES= www
MASTER_SITES= http://faith.eu.org/ffproxy/
@ -10,17 +10,17 @@ HOMEPAGE= http://faith.eu.org/programs.html\#ffproxy
MAINTAINER= Johan Fredin <johan@spelaroll.se>
# GPL
# GPLv2+
PERMIT_DISTFILES_CDROM= Yes
PERMIT_DISTFILES_FTP= Yes
PERMIT_PACKAGE_CDROM= Yes
PERMIT_PACKAGE_FTP= Yes
WANTLIB= c
WANTLIB= c
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --datadir=/var
USE_GROFF = Yes
NO_REGRESS= Yes
post-install:

48
www/ffproxy/patches/patch-request_c Normal file
View File

@ -0,0 +1,48 @@
$OpenBSD: patch-request_c,v 1.1 2012/03/16 22:01:37 sthen Exp $
--- request.c.orig Fri Mar 16 21:59:09 2012
+++ request.c Fri Mar 16 21:59:24 2012
@@ -49,7 +49,7 @@
static int read_header(int, struct req *);
static char sgetc(int);
-static size_t getline(int, char[], int);
+static size_t my_getline(int, char[], int);
static int do_request(int, struct req *);
void
@@ -63,7 +63,7 @@ keep_alive:
(void) memset(&r, 0, sizeof(r));
r.cl = clinfo;
- if (getline(cl, buf, sizeof(buf)) < 1)
+ if (my_getline(cl, buf, sizeof(buf)) < 1)
*buf = '\0';
if ((http_url(&r, buf)) == 0) {
@@ -189,7 +189,7 @@ read_header(int cl, struct req * r)
char *b, *p;
i = 0;
- while ((len = getline(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ while ((len = my_getline(cl, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
b = buf;
while (isspace((int) *b) && *(b++) != '\0');
if (*b == '\0')
@@ -228,7 +228,7 @@ sgetc(int s)
}
static size_t
-getline(int s, char buf[], int len)
+my_getline(int s, char buf[], int len)
{
int c;
size_t i;
@@ -493,7 +493,7 @@ do_request(int cl, struct req * r)
}
if (r->type != CONNECT) {
i = 0;
- while ((len = getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
+ while ((len = my_getline(s, buf, sizeof(buf))) > 0 && i < sizeof(r->header) - 1) {
DEBUG(("do_request() => got remote header line: (%s)", buf));
r->header[i] = (char *) my_alloc(len + 1);
(void) strcpy(r->header[i++], buf);