[prev in list] [next in list] [prev in thread] [next in thread] 

List:       listar-dev
Subject:    [EDev] merge some fixes present in the debian package
From:       Julien WAJSBERG <flash () minet ! net>
Date:       2004-04-29 16:07:10
Message-ID: Pine.LNX.4.58.0404291720351.31542 () trex ! minet ! net
[Download RAW message or body]

Hi,
I began comparing debian's official package with the files I supplied
on this list.

I found that some fixes present in Debian's diff files could be integrated
in ecartis' source.

ecartis-signed-char.patch : on some architectures, char is unsigned by
default (http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=177391 for more
informations)

ecartis-use-def_err.patch : sort of addon to erik's patch: use def_err if
strerror doesn't work (modified version of the debian's code: are you
ok with this change, Blars ?).

for this one, I just found something else: in fileapi.c, there are these
lines :
#ifdef NEED_STRERROR
#define strerror(a) sys_errlist[(a)]
#endif

So maybe the #ifdef _AIX thing isn't really useful: if you don't have
strerror, just comment out the right line in Makefile.dist.


ecartis-bouncer-check_mptr.patch : security patch

ecartis-check-space.patch: didn't really understand this one; Blars, do
you have a clue ?

-- 
Julien

-- Attached file included as plaintext by Ecartis --
-- File: ecartis-use-def_err.patch

Index: src/core.c
===================================================================
RCS file: /usr/cvsroot/ecartis/src/core.c,v
retrieving revision 1.10
diff -u -r1.10 core.c
--- src/core.c	26 Apr 2004 13:10:53 -0000	1.10
+++ src/core.c	29 Apr 2004 16:03:21 -0000
@@ -1242,6 +1242,7 @@
    if (error > sys_nerr) tmp = &def_err[0]; else tmp = sys_errlist[error];
 #else
    tmp = strerror (error);
+   if (errno == EINVAL) return &def_err[0];
 #endif
 
    return tmp;

-- Attached file included as plaintext by Ecartis --
-- File: ecartis-signed-char.patch

--- src/codes.c
+++ src/codes.c
@@ -25,7 +25,7 @@ 
 static char basis_64[] =
    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
-static char index_64[128] = {
+static signed char index_64[128] = {
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,62, -1,-1,-1,63,
@@ -164,7 +164,7 @@
 }
 
 static char basis_hex[] = "0123456789ABCDEF";
-static char index_hex[128] = {
+static signed char index_hex[128] = {
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,
     -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1, -1,-1,-1,-1,


-- Attached file included as plaintext by Ecartis --
-- File: ecartis-check-space.patch

Index: src/modules/bouncer/custom.c
===================================================================
RCS file: /usr/cvsroot/ecartis/src/modules/bouncer/custom.c,v
retrieving revision 1.3
diff -u -r1.3 custom.c
--- src/modules/bouncer/custom.c	11 Aug 2002 22:25:11 -0000	1.3
+++ src/modules/bouncer/custom.c	29 Apr 2004 15:36:18 -0000
@@ -134,7 +134,7 @@
       if (buf[strlen(buf) - 1] == '\n')
           buf[strlen(buf) - 1] = 0;
  
-      if ((strncmp(buf,"  ",2) == 0) && strchr(buf,'@') && strchr(buf,':')) {
+      if ((strncmp(buf,"  ",2) == 0) && buf[2] != ' ' && strchr(buf,'@')) {
          char *mptr;
 
          mptr = &(buf[0]);

-- Attached file included as plaintext by Ecartis --
-- File: ecartis-bouncer-check_mptr.patch

Index: src/modules/bouncer/custom.c
===================================================================
RCS file: /usr/cvsroot/ecartis/src/modules/bouncer/custom.c,v
retrieving revision 1.3
diff -u -r1.3 custom.c
--- src/modules/bouncer/custom.c	11 Aug 2002 22:25:11 -0000	1.3
+++ src/modules/bouncer/custom.c	29 Apr 2004 15:34:56 -0000
@@ -142,7 +142,7 @@
 
          LMAPI->buffer_printf(useraddy, sizeof(useraddy) - 1, "%s", mptr);
          mptr = strrchr(useraddy,':');
-         if (*mptr) *mptr = 0;
+         if (mptr) *mptr = 0;
 
          LMAPI->read_file(buf, sizeof(buf), infile);
 


[prev in list] [next in list] [prev in thread] [next in thread]