Attachment 131997 Details for Bug 176178 – file.diff

[patch] file.diff

file.diff (text/plain), 1.22 KB, created by John Bayly on 2013-02-15 18:10:00 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: John Bayly

Created: 2013-02-15 18:10:00 UTC

Size: 1.22 KB

patch

obsolete

>--- iaxmodem.c.orig	2009-02-21 18:57:05.000000000 +0000
>+++ iaxmodem.c	2011-11-16 16:18:48.000000000 +0000
>@@ -21,17 +21,18 @@
> #include <string.h>
> #include <strings.h>
> 
>-#ifndef __OpenBSD__
>+#if !defined(__OpenBSD__) && !defined(__FreeBSD__)
> # ifndef USE_UNIX98_PTY
> #  include <pty.h>
> # endif /* !USE_UNIX98_PTY */
> #else
>+#include <termios.h>
>+#if !defined(__FreeBSD__)
> # include <util.h>
> #endif
>+#endif
> 
> 
>-#include <termios.h>
>-
> #include <stdlib.h>
> #include <unistd.h>
> #include <dirent.h>
>@@ -53,6 +54,26 @@
> #include <math.h>
> 
> #include <stdint.h>
>+
>+#ifdef __FreeBSD__
>+#include <libutil.h>
>+char* strndup(const char* string, size_t n)
>+{
>+        char* copy_string = 0;
>+
>+        if(0 == string || 0 == n)
>+                return 0;
>+
>+        copy_string = (char*) malloc(n + 1);
>+        if(0 == copy_string)
>+                return 0;
>+
>+        memcpy(copy_string, string, n);
>+        *(copy_string + n) = '\0';
>+
>+        return copy_string;
>+}
>+#endif
> #include <tiffio.h>
> 
> #ifndef O_LARGEFILE
>@@ -1645,8 +1666,6 @@
> 	}
>       }
> 
>-    closedir(cfdir);
>-
>     if (pid == 0) {
>       /* Start the modem */
>       iaxmodem(config, 0);
>@@ -1654,6 +1673,8 @@
>       return 1;
>     }
> 
>+    closedir(cfdir);
>+
>     return 0;
> }

Actions: View | Diff

Attachments on bug 176178: 131997