[csw-devel] SF.net SVN: gar:[3799] csw/mgar/pkg/gftp/trunk

[jake_goerzen at users.sourceforge.net]

Revision: 3799
          http://gar.svn.sourceforge.net/gar/?rev=3799&view=rev
Author:   jake_goerzen
Date:     2009-03-18 04:12:10 +0000 (Wed, 18 Mar 2009)

Log Message:
-----------
fix patch file

Modified Paths:
--------------
    csw/mgar/pkg/gftp/trunk/checksums
    csw/mgar/pkg/gftp/trunk/files/lock.c.diff

Modified: csw/mgar/pkg/gftp/trunk/checksums
===================================================================
--- csw/mgar/pkg/gftp/trunk/checksums	2009-03-17 23:48:01 UTC (rev 3798)
+++ csw/mgar/pkg/gftp/trunk/checksums	2009-03-18 04:12:10 UTC (rev 3799)
@@ -1,4 +1,4 @@
 5183cb4955d94be0e03c892585547c64  download/gftp-2.0.19.tar.bz2
 351516b0d9da33501cf3be76a1fa7a61  download/CSWgftp.gspec
 cf85c5ad82928bf1e4e9d0f89be8378f  download/CSWgftp.depend
-a80450e02ea01bcc5276f8f2ded3c1d6  download/lock.c.diff
+79a0159a3c22538328e40cccc13be50c  download/lock.c.diff

Modified: csw/mgar/pkg/gftp/trunk/files/lock.c.diff
===================================================================
--- csw/mgar/pkg/gftp/trunk/files/lock.c.diff	2009-03-17 23:48:01 UTC (rev 3798)
+++ csw/mgar/pkg/gftp/trunk/files/lock.c.diff	2009-03-18 04:12:10 UTC (rev 3799)
@@ -1,32 +1,16 @@
 diff --speed-large-files --minimal -Nru gftp-2.0.19.orig/lib/fsplib/lock.c gftp-2.0.19/lib/fsplib/lock.c
 --- gftp-2.0.19.orig/lib/fsplib/lock.c	2008-11-29 13:47:18.000000000 +0100
-+++ gftp-2.0.19/lib/fsplib/lock.c	2009-03-17 04:22:26.936537459 +0100
-@@ -52,7 +52,7 @@
-   int val;
-   struct semid_ds *buf;
-   unsigned short int *array;
--  struct seminfo *__buf;
-+//  struct seminfo *__buf;
- };
- #endif
- 
-@@ -91,7 +91,7 @@
++++ gftp-2.0.19/lib/fsplib/lock.c	2009-03-18 04:46:10.916531020 +0100
+@@ -91,7 +91,11 @@
    mode_t omask;
    key_t lock_key;
    int fd;
 -  union semun su;
-+  union semun;
++  union semun {
++	int val;
++	struct semid_ds *buf;
++	ushort *array;
++  } su;
    struct sembuf sem;
  
    make_key_string(lock,server_addr,server_port);
-@@ -123,8 +123,8 @@
- 	  return -1;
-       }
-       /* we need to init this semaphore */
--      su.val=1;
--      if(semctl(lock->lock_sem,0,SETVAL,su) == -1)
-+    //  arg.val=1;
-+      if(semctl(lock->lock_sem,0,SETVAL) == -1)
-       {
- 	  perror("semctl setval");
- 	  return -1;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.