diff options
| author | Michael Haro <mharo@FreeBSD.org> | 1999-04-22 08:01:58 +0000 |
|---|---|---|
| committer | Michael Haro <mharo@FreeBSD.org> | 1999-04-22 08:01:58 +0000 |
| commit | b6fff4a902244a387c5f76398a5aa039351d8661 (patch) | |
| tree | 9d41c9e97228f5e53e0faf240a75d9008ba51019 /ftp/pavuk/files | |
| parent | gtk11 -> gtk12 (diff) | |
Update to pl9, and now use gtk12
PR: 11273
Submitted by: Chris Piazza <cpiazza@home.net>
Notes
Notes:
svn path=/head/; revision=18077
Diffstat (limited to 'ftp/pavuk/files')
| -rw-r--r-- | ftp/pavuk/files/patch-ab | 48 |
1 files changed, 31 insertions, 17 deletions
diff --git a/ftp/pavuk/files/patch-ab b/ftp/pavuk/files/patch-ab index 8fb78d9dfe8c..1380df0a7dc2 100644 --- a/ftp/pavuk/files/patch-ab +++ b/ftp/pavuk/files/patch-ab @@ -1,22 +1,36 @@ ---- src/net.c Sun Feb 1 10:53:47 1998 -+++ /home/andy/tmp/wrk/src/net.c Fri Mar 20 22:00:21 1998 -@@ -129,7 +129,9 @@ - - } - +--- src/net.c.orig Sun Apr 18 06:53:46 1999 ++++ src/net.c Wed Apr 21 22:44:24 1999 +@@ -101,9 +101,9 @@ + { + return -1; + } +- +#ifndef __FreeBSD__ - fcntl(sock , F_SETFL , O_SYNC); + fcntl(sock , F_SETFL , O_NONBLOCK); +- +#endif - if ((connect(sock, (struct sockaddr*)&addr, sizeof(addr)) == -1) && - (errno && (errno != EISCONN))) - { -@@ -259,7 +261,9 @@ - } - } + rv = connect(sock, (struct sockaddr*)&addr, sizeof(addr)); + if (rv && (errno != EINPROGRESS) && (errno != EISCONN)) + { +@@ -121,8 +121,8 @@ + #endif + + #ifdef GTK_FACE +- cfg.gtk.inid = gtk_timeout_add(cfg.ctimeout * 60000 , +- (GtkFunction)TOut , NULL); ++ cfg.gtk.inid = cfg.ctimeout ? gtk_timeout_add(cfg.ctimeout * 60000 , ++ (GtkFunction)TOut , NULL) : 0; + #endif + +@@ -261,8 +261,9 @@ + #ifdef I_FACE + if (cfg.xi_face) + { +#ifndef __FreeBSD__ - fcntl(sock , F_SETFL , O_SYNC); + fcntl(sock , F_SETFL , O_NONBLOCK); +- +#endif - } - #endif - if ((rsock < 0) && ((rsock = accept(sock, (struct sockaddr*)&caller, &p)) == -1)) + rsock = accept(sock, (struct sockaddr*)&caller, &p); + if ((rsock < 0) && (errno != EWOULDBLOCK)) + { |