Attachment 8578 Details for Bug 17892 – file.diff

[patch] file.diff

file.diff (text/plain), 4.97 KB, created by Denis Shaposhnikov on 2000-04-10 07:20:01 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Denis Shaposhnikov

Created: 2000-04-10 07:20:01 UTC

Size: 4.97 KB

patch

obsolete

>diff -Nru binkd.orig/Makefile binkd/Makefile
>--- binkd.orig/Makefile	Mon Apr 10 02:12:34 2000
>+++ binkd/Makefile	Mon Apr 10 09:56:29 2000
>@@ -1,4 +1,5 @@
> # New ports collection makefile for:	binkd
>+# Version required:	0.9.3
> # Date created:		19 August 1998
> # Whom:			Andrey Zakhvatov
> #
>@@ -20,7 +21,9 @@
> MAN8=		binkd.8
> 
> .if defined(WITH_AMIGA4D)
>-EXTRA_PATCHES+=	${FILESDIR}/patch-amiga4d
>+PATCH_SITES=	${MASTER_SITES}
>+PATCHFILES=	binkdaso.diff
>+PATCH_DIST_STRIP=	-l
> DEFINES+=	-DAMIGADOS_4D_OUTBOUND
> MAKE_ENV+=	DEFINES="${DEFINES}"
> .endif
>diff -Nru binkd.orig/files/md5 binkd/files/md5
>--- binkd.orig/files/md5	Sun Apr  2 03:12:50 2000
>+++ binkd/files/md5	Mon Apr 10 09:55:56 2000
>@@ -1 +1,2 @@
> MD5 (binkd093.zip) = 1e00c5fd61055383a00db8e7d538a1dc
>+MD5 (binkdaso.diff) = 8fc68563fb7243a80aa00044846db847
>diff -Nru binkd.orig/files/patch-amiga4d binkd/files/patch-amiga4d
>--- binkd.orig/files/patch-amiga4d	Sat Apr  1 05:40:59 2000
>+++ binkd/files/patch-amiga4d	Thu Jan  1 03:00:00 1970
>@@ -1,150 +0,0 @@
>---- ftnaddr.c.orig	Thu Oct 23 08:12:18 1997
>-+++ ftnaddr.c	Wed Mar  8 20:50:09 2000
>-@@ -225,6 +225,7 @@
>-   }
>-   else
>-   {
>-+#ifndef AMIGADOS_4D_OUTBOUND
>-     char ext[] = "\0ext";	       /* ".ext" */
>-     char pnt[] = "\0pnt/0000xxxx";     /* ".pnt..." */
>- 
>-@@ -233,6 +234,7 @@
>- 
>-     if (fa->p != 0)
>-       sprintf (pnt, ".pnt%s%08x", PATH_SEPARATOR, fa->p);
>-+#endif /* AMIGADOS_4D_OUTBOUND */
>- 
>- #ifdef HAVE_SNPRINTF
>-     snprintf
>-@@ -243,8 +245,13 @@
>- #ifdef HAVE_SNPRINTF
>-        MAXPATHLEN,
>- #endif
>-+#ifdef AMIGADOS_4D_OUTBOUND
>-+       "%s%s%s%s%d.%d.%d.%d", d->path, PATH_SEPARATOR, d->dir,
>-+	 PATH_SEPARATOR, fa->z, fa->net, fa->node, fa->p);
>-+#else
>-        "%s%s%s%s%s%04x%04x%s",
>-        d->path, PATH_SEPARATOR, d->dir, ext, PATH_SEPARATOR,
>-        fa->net, fa->node, pnt);
>-+#endif /* AMIGADOS_4D_OUTBOUND */
>-   }
>- }
>-
>---- ftnq.c.orig	Mon Nov  3 09:12:45 1997
>-+++ ftnq.c	Thu Mar  9 13:23:03 2000
>-@@ -157,9 +157,11 @@
>- 	  FTN_ADDR fa;
>- 
>- 	  FA_ZERO (&fa);
>-+#ifndef AMIGADOS_4D_OUTBOUND
>- 	  fa.z = ((de->d_name[len] == '.') ?
>- 		  strtol (de->d_name + len + 1, (char **) NULL, 16) :
>- 		  curr_domain->z[0]);
>-+#endif /* AMIGADOS_4D_OUTBOUND */
>- 	  if (de->d_name[len] == 0 || fa.z != curr_domain->z[0])
>- 	  {
>- 	    strcpy (fa.domain, curr_domain->name);
>-@@ -302,7 +304,9 @@
>-   DIR *dp;
>-   FTN_ADDR fa2;
>-   char buf[MAXPATHLEN + 1];
>-+#ifndef AMIGADOS_4D_OUTBOUND
>-   int j;
>-+#endif /* AMIGADOS_4D_OUTBOUND */
>-   char *s;
>- 
>-   if ((dp = opendir (dir)) != 0)
>-@@ -311,6 +315,52 @@
>- 
>-     while ((de = readdir (dp)) != 0)
>-     {
>-+#ifdef AMIGADOS_4D_OUTBOUND
>-+      char ext[4];
>-+      int matched = 0;
>-+      size_t nlen = strlen(s = de->d_name);
>-+
>-+      for (; *s && isgraph(*s) != 0; s++);
>-+      if (s - de->d_name != nlen)
>-+	continue;
>-+
>-+      memcpy (&fa2, fa1, sizeof(FTN_ADDR));
>-+
>-+      if (sscanf(s = de->d_name, "%d.%d.%d.%d.%3s%n",
>-+	         &fa2.z, &fa2.net, &fa2.node, &fa2.p, ext, &matched) != 5 ||
>-+	  matched != nlen || strlen(ext) != 3)
>-+	continue;
>-+
>-+      if ((fa1->z != -1 && fa1->z != fa2.z) ||
>-+	  (fa1->net != -1 && fa1->net != fa2.net) ||
>-+	  (fa1->node != -1 && fa1->node != fa2.node) ||
>-+	  (fa1->p != -1 && fa1->p != fa2.p))
>-+	continue;
>-+
>-+      strnzcpy(buf, dir, sizeof(buf));
>-+      strnzcpy(buf + strlen(buf), PATH_SEPARATOR, sizeof(buf) - strlen(buf));
>-+      strnzcpy(buf + strlen(buf), s, sizeof(buf) - strlen(buf));
>-+
>-+      if (!STRICMP(ext, "bsy") || !STRICMP(ext, "csy"))
>-+	process_bsy(&fa2, buf);
>-+
>-+      if (!(get_node_info(&fa2) || is5D(fa1)))
>-+        continue;
>-+
>-+      if (strchr(out_flvrs, ext[0]) &&
>-+		tolower(ext[1]) == 'u' && tolower(ext[2]) == 't')
>-+	/* Adding *.?ut */
>-+	q = q_add_file(q, buf, &fa2, ext[0], 'd', 'm');
>-+      else if (!STRICMP(ext, "req"))
>-+	/* Adding *.req */
>-+	q = q_add_file(q, buf, &fa2, 'h', 's', 'r');
>-+      else if (!STRICMP(ext, "hld"))
>-+	process_hld(&fa2, buf);
>-+      else if (strchr(flo_flvrs, ext[0]) &&
>-+		      tolower(ext[1]) == 'l' && tolower(ext[2]) == 'o')
>-+	/* Adding *.?lo */
>-+	q = q_add_file(q, buf, &fa2, ext[0], 'd', 'l');
>-+#else /* AMIGADOS_4D_OUTBOUND */
>-       s = de->d_name;
>- 
>-       for (j = 0; j < 8; ++j)
>-@@ -378,6 +428,7 @@
>- 	  }
>- 	}
>-       }
>-+#endif /* AMIGADOS_4D_OUTBOUND */
>-     }
>-     closedir (dp);
>-   }
>-
>---- prothlp.c.orig	Wed Nov  5 04:11:33 1997
>-+++ prothlp.c	Wed Mar  8 20:50:09 2000
>-@@ -31,6 +31,9 @@
>- #include <string.h>
>- #include <stdio.h>
>- #include <stdlib.h>
>-+#ifdef AMIGADOS_4D_OUTBOUND
>-+#include <ctype.h>
>-+#endif /* AMIGADOS_4D_OUTBOUND */
>- 
>- #include "Config.h"
>- #include "sys.h"
>-@@ -145,5 +148,18 @@
>-       if (strlen (++z) == 3)
>- 	if ((*z >= '0') && (*z < '7') && (z[1] == '#'))
>- 	  memcpy (z, weekext[*z - '0'], 2);
>-+#ifdef AMIGADOS_4D_OUTBOUND
>-+        else
>-+	{
>-+	    int n;
>-+	    for (n = 0; n < 7 && STRNICMP(z, weekext[n], 2); n++);
>-+	    if (n != 7)
>-+	    {
>-+		char last = z[2];
>-+		sprintf(s, "%08lx.%c%c%c",
>-+			rnd(), tolower(weekext[n][0]), weekext[n][1], last);
>-+	    }
>-+	}
>-+#endif
>-   }
>- }

Actions: View | Diff

Attachments on bug 17892: 8578