Attachment 63808 Details for Bug 95065 – file.diff

[patch] file.diff

file.diff (text/plain), 5.77 KB, created by Sergio Mangialardi on 2006-03-29 07:00:30 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Sergio Mangialardi

Created: 2006-03-29 07:00:30 UTC

Size: 5.77 KB

patch

obsolete

>diff -u -N -r ddd.orig/distinfo ddd/distinfo
>--- ddd.orig/distinfo   Sun Jan 29 09:54:25 2006
>+++ ddd/distinfo        Wed Mar 29 07:16:19 2006
>@@ -1,3 +1,3 @@
>-MD5 (ddd-3.3.10.tar.gz) = a10a3b55455cce8073cf2f8db01ba1a1
>-SHA256 (ddd-3.3.10.tar.gz) = 3e1b986d4719c393eab6bc1366ee274608cc7432c0776c4b0c0e162f8175af7b
>-SIZE (ddd-3.3.10.tar.gz) = 7620458
>+MD5 (ddd-3.3.11.tar.gz) = f19437ebfdb5f2667d6de30f700dd319
>+SHA256 (ddd-3.3.11.tar.gz) = a555d76e1d4d5fa092b190ffb99cdde8880131c063e4b53435df3a022ed4d3da
>+SIZE (ddd-3.3.11.tar.gz) = 7564005
>diff -u -N -r ddd.orig/files/patch-ddd-LiterateA.C ddd/files/patch-ddd-LiterateA.C
>--- ddd.orig/files/patch-ddd-LiterateA.C        Thu Jan  1 01:00:00 1970
>+++ ddd/files/patch-ddd-LiterateA.C     Wed Mar 29 07:16:19 2006
>@@ -0,0 +1,32 @@
>+--- ddd/LiterateA.C.orig       Sat Nov  6 19:00:37 2004
>++++ ddd/LiterateA.C    Sat Nov  6 19:04:44 2004
>+@@ -216,8 +216,12 @@
>+     int flags = fcntl(fileno(fp), F_GETFL, 0);
>+     if (flags == -1)
>+       _raiseIOWarning("cannot get file descriptor status flags");
>+-    if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1)
>+-      _raiseIOWarning("cannot set file to non-blocking mode");
>++    if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) {
>++#if defined(__FreeBSD__)
>++        if(errno != EAGAIN)
>++#endif
>++        _raiseIOWarning("cannot set file to non-blocking mode");
>++    }
>+ #endif
>+
>+     // Read stuff
>+@@ -251,8 +255,12 @@
>+
>+ #if HAVE_FCNTL && defined(F_SETFL)
>+     // Reset file state
>+-    if (fcntl(fileno(fp), F_SETFL, flags) == -1)
>+-      _raiseIOWarning("cannot restore file mode");
>++    if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
>++#if defined(__FreeBSD__)
>++        if(errno != EAGAIN)
>++#endif
>++        _raiseIOWarning("cannot restore file mode");
>++    }
>+ #endif
>+
>+     return nitems;
>diff -u -N -r ddd.orig/files/patch-ddd-Makefile.in ddd/files/patch-ddd-Makefile.in
>--- ddd.orig/files/patch-ddd-Makefile.in        Thu Jan  1 01:00:00 1970
>+++ ddd/files/patch-ddd-Makefile.in     Wed Mar 29 07:16:19 2006
>@@ -0,0 +1,11 @@
>+--- ddd/Makefile.in.orig       Sat Nov  6 18:53:54 2004
>++++ ddd/Makefile.in    Sat Nov  6 18:54:32 2004
>+@@ -369,7 +369,7 @@
>+ LPR = @LPR@
>+ LTLIBOBJS = @LTLIBOBJS@
>+ M4 = @M4@
>+-MAKEINFO = @MAKEINFO@
>++MAKEINFO = @MAKEINFO@ --no-split
>+ MINIMAL_TOC = @MINIMAL_TOC@
>+ NICKNAME = @NICKNAME@
>+ OBJEXT = @OBJEXT@
>diff -u -N -r ddd.orig/files/patch-ddd-TTYAgent.C ddd/files/patch-ddd-TTYAgent.C
>--- ddd.orig/files/patch-ddd-TTYAgent.C Thu Jan  1 01:00:00 1970
>+++ ddd/files/patch-ddd-TTYAgent.C      Wed Mar 29 07:16:19 2006
>@@ -0,0 +1,22 @@
>+--- ddd/TTYAgent.C.orig        Sat Nov  6 19:05:52 2004
>++++ ddd/TTYAgent.C     Sat Nov  6 19:08:23 2004
>+@@ -715,8 +715,19 @@
>+     }
>+     else
>+     {
>++#if !defined(__FreeBSD__)
>+       if (fcntl(master, F_SETFL, flags | O_NONBLOCK) == -1)
>+           _raiseIOWarning("cannot set file to non-blocking mode");
>++#else
>++    do {
>++        if(fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1)
>++            break;
>++        else if(errno == EAGAIN)
>++            sleep(1);
>++        else
>++            _raiseIOWarning("cannot set file to non-blocking mode");
>++    } while(errno == EAGAIN);
>++#endif
>+     }
>+ #endif
>+
>diff -u -N -r ddd.orig/files/patch-ddd::LiterateA.C ddd/files/patch-ddd::LiterateA.C
>--- ddd.orig/files/patch-ddd::LiterateA.C       Sat Dec  4 20:34:14 2004
>+++ ddd/files/patch-ddd::LiterateA.C    Thu Jan  1 01:00:00 1970
>@@ -1,32 +0,0 @@
>---- ddd/LiterateA.C.orig       Sat Nov  6 19:00:37 2004
>-+++ ddd/LiterateA.C    Sat Nov  6 19:04:44 2004
>-@@ -216,8 +216,12 @@
>-     int flags = fcntl(fileno(fp), F_GETFL, 0);
>-     if (flags == -1)
>-       _raiseIOWarning("cannot get file descriptor status flags");
>--    if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1)
>--      _raiseIOWarning("cannot set file to non-blocking mode");
>-+    if (fcntl(fileno(fp), F_SETFL, flags | O_NONBLOCK) == -1) {
>-+#if defined(__FreeBSD__)
>-+        if(errno != EAGAIN)
>-+#endif
>-+        _raiseIOWarning("cannot set file to non-blocking mode");
>-+    }
>- #endif
>-
>-     // Read stuff
>-@@ -251,8 +255,12 @@
>-
>- #if HAVE_FCNTL && defined(F_SETFL)
>-     // Reset file state
>--    if (fcntl(fileno(fp), F_SETFL, flags) == -1)
>--      _raiseIOWarning("cannot restore file mode");
>-+    if (fcntl(fileno(fp), F_SETFL, flags) == -1) {
>-+#if defined(__FreeBSD__)
>-+        if(errno != EAGAIN)
>-+#endif
>-+        _raiseIOWarning("cannot restore file mode");
>-+    }
>- #endif
>-
>-     return nitems;
>diff -u -N -r ddd.orig/files/patch-ddd::Makefile.in ddd/files/patch-ddd::Makefile.in
>--- ddd.orig/files/patch-ddd::Makefile.in       Sat Dec  4 20:34:14 2004
>+++ ddd/files/patch-ddd::Makefile.in    Thu Jan  1 01:00:00 1970
>@@ -1,11 +0,0 @@
>---- ddd/Makefile.in.orig       Sat Nov  6 18:53:54 2004
>-+++ ddd/Makefile.in    Sat Nov  6 18:54:32 2004
>-@@ -369,7 +369,7 @@
>- LPR = @LPR@
>- LTLIBOBJS = @LTLIBOBJS@
>- M4 = @M4@
>--MAKEINFO = @MAKEINFO@
>-+MAKEINFO = @MAKEINFO@ --no-split
>- MINIMAL_TOC = @MINIMAL_TOC@
>- NICKNAME = @NICKNAME@
>- OBJEXT = @OBJEXT@
>diff -u -N -r ddd.orig/files/patch-ddd::TTYAgent.C ddd/files/patch-ddd::TTYAgent.C
>--- ddd.orig/files/patch-ddd::TTYAgent.C        Sat Dec  4 20:34:14 2004
>+++ ddd/files/patch-ddd::TTYAgent.C     Thu Jan  1 01:00:00 1970
>@@ -1,22 +0,0 @@
>---- ddd/TTYAgent.C.orig        Sat Nov  6 19:05:52 2004
>-+++ ddd/TTYAgent.C     Sat Nov  6 19:08:23 2004
>-@@ -715,8 +715,19 @@
>-     }
>-     else
>-     {
>-+#if !defined(__FreeBSD__)
>-       if (fcntl(master, F_SETFL, flags | O_NONBLOCK) == -1)
>-           _raiseIOWarning("cannot set file to non-blocking mode");
>-+#else
>-+    do {
>-+        if(fcntl(master, F_SETFL, flags | O_NONBLOCK) != -1)
>-+            break;
>-+        else if(errno == EAGAIN)
>-+            sleep(1);
>-+        else
>-+            _raiseIOWarning("cannot set file to non-blocking mode");
>-+    } while(errno == EAGAIN);
>-+#endif
>-     }
>- #endif
>-

Actions: View | Diff

Attachments on bug 95065: 63807 | 63808