diff options
Diffstat (limited to 'sysutils/afio/files/patch-ab')
| -rw-r--r-- | sysutils/afio/files/patch-ab | 116 |
1 files changed, 83 insertions, 33 deletions
diff --git a/sysutils/afio/files/patch-ab b/sysutils/afio/files/patch-ab index fae1131cd3c1..cce0a343ebcc 100644 --- a/sysutils/afio/files/patch-ab +++ b/sysutils/afio/files/patch-ab @@ -1,33 +1,83 @@ ---- afio.c.orig Tue Oct 9 23:03:53 2001 -+++ afio.c Mon Sep 29 16:34:02 2003 -@@ -613,7 +613,7 @@ - aruntil, arbsize); - #else - fprintf (stderr, "Media size %ld is less than block size %d\n", -- (ulong) aruntil, arbsize); -+ (u_long) aruntil, arbsize); - #endif - usage (); - } -@@ -2929,10 +2929,10 @@ - see out(). - */ - if(asb->sb_rdev==0) asb->sb_rdev=(asb->sb_dev << 16) + asb->sb_ino; -- if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0 -+ if (mkfifo (name, asb->sb_mode) < 0 - && (errno != ENOENT - || dirneed (name) < 0 -- || mknod (name, asb->sb_mode, asb->sb_rdev) < 0)) -+ || mkfifo (name, asb->sb_mode) < 0)) - return (warn (name, syserr ())); - break; - case S_IFDIR: -@@ -2960,7 +2960,7 @@ - return (warn (name, syserr ())); - break; - #endif /* S_IFIFO */ --#ifdef S_IFSOCK -+#ifdef S_IFSOCK && !defined (__FreeBSD__) - case S_IFSOCK: - fd = 0; - if (exists) +*** afio.c.orig Sat Dec 20 17:16:13 2003 +--- afio.c Sat Jan 21 17:31:23 2006 +*************** +*** 648,658 **** + daniel.andersson@sto.sema.se */ + fprintf (stderr, "Media size %ld is less than block size %d\n", + aruntil, arbsize); + #else + fprintf (stderr, "Media size %ld is less than block size %d\n", +! (unsigned long) aruntil, arbsize); + #endif + usage (); + } + if (arpad == 0) + arpad = arbsize; +--- 648,658 ---- + daniel.andersson@sto.sema.se */ + fprintf (stderr, "Media size %ld is less than block size %d\n", + aruntil, arbsize); + #else + fprintf (stderr, "Media size %ld is less than block size %d\n", +! (u_long) aruntil, arbsize); + #endif + usage (); + } + if (arpad == 0) + arpad = arbsize; +*************** +*** 3155,3168 **** + return (warn (name, syserr ())); + else + exists = 0; + } + +! if (mknod (name, asb->sb_mode, asb->sb_rdev) < 0 + && (errno != ENOENT + || dirneed (name) < 0 +! || mknod (name, asb->sb_mode, asb->sb_rdev) < 0)) + return (warn (name, syserr ())); + break; + case S_IFDIR: + if (exists) + { +--- 3155,3168 ---- + return (warn (name, syserr ())); + else + exists = 0; + } + +! if (mkfifo (name, asb->sb_mode) < 0 + && (errno != ENOENT + || dirneed (name) < 0 +! || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + case S_IFDIR: + if (exists) + { +*************** +*** 3194,3204 **** + || dirneed (name) < 0 + || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + #endif /* S_IFIFO */ +! #ifdef S_IFSOCK + case S_IFSOCK: + fd = 0; + if (exists) + if (perm != operm && chmod (name, perm) < 0) + return (warn (name, syserr ())); +--- 3194,3204 ---- + || dirneed (name) < 0 + || mkfifo (name, asb->sb_mode) < 0)) + return (warn (name, syserr ())); + break; + #endif /* S_IFIFO */ +! #ifdef S_IFSOCK && !defined (__FreeBSD__) + case S_IFSOCK: + fd = 0; + if (exists) + if (perm != operm && chmod (name, perm) < 0) + return (warn (name, syserr ())); |