PORTREVISION=	1

LICENSE=	MPL

 LIBFILE=librexxutil

--- inifile.c.orig	2003-02-20 00:04:42 UTC

+++ inifile.c

@@ -194,7 +194,7 @@ static int read_ini_raw(inif_t fit)

    fseek(fit->fp, 0, SEEK_SET);

    while ((oldoff = ftell(fit->fp)), 

-          fgets(buf, sizeof(buf), fit->fp) != NULL) {

+          fgets((char *) buf, sizeof(buf), fit->fp) != NULL) {

       /* skip leading whitespace */

       for (i = 0; !pt[buf[i]]; i++)

@@ -204,8 +204,8 @@ static int read_ini_raw(inif_t fit)

        * line */

       switch (pt[buf[i]]) {

          /* errors */

-         case CV_RBRACK: n = "closing bracket"; goto oops;

-         case CV_EQUALS: n = "equals sign"; goto oops;

+         case CV_RBRACK: n = (unsigned char *) "closing bracket"; goto oops;

+         case CV_EQUALS: n = (unsigned char *) "equals sign"; goto oops;

          oops:

             fprintf(stderr, "oops: line starts with %s: %s\n", n, buf);

@@ -284,7 +284,7 @@ static int read_ini_raw(inif_t fit)

           *            write anything before the first section */

          case CV_EOS:

          case CV_COMMENT:

-            i = strlen(buf);

+            i = strlen((char *) buf);

             if (lvt) {

                lvt->comment = realloc(lvt->comment, cl + i + 1);

                memcpy(lvt->comment+cl, buf, i+1);

--- regfilesys.c.orig	2003-11-03 20:24:14 UTC

+++ regfilesys.c

@@ -114,7 +114,8 @@ int unmapfile(char *buf, int size);

 /* SysFileSearch(target,file,stem, [options]) */

 rxfunc(sysfilesearch)

 {

-    unsigned char *buf, * dptr, *bol, *eol, *eof, *filename, *options,

+    char *filename, *options;

+    unsigned char *buf, * dptr, *bol, *eol, *eof,

                   *lbuf = NULL;

     PRXSTRING stem;

     RXSTRING target;

@@ -141,7 +142,7 @@ rxfunc(sysfilesearch)

     /* map the file into memory. Note that if the OS doesn't support memory-

      * mapped I/O, this allocates a buffer and reads the file into it. */

-    if (!(buf = mapfile(filename, &len))) {

+    if (!(buf = (unsigned char *) mapfile((char *) filename, &len))) {

 	rc = 3;

     }

     else {

@@ -195,7 +196,7 @@ rxfunc(sysfilesearch)

                     i = eol - bol;

                     if (i && bol[i-1] == '\r')

                        i--;

-		    if (cha_adddummy(array, bol, i))

+		    if (cha_adddummy(array, (char *) bol, i))

 			rc = 2;

 		}

 		else {

@@ -203,12 +204,12 @@ rxfunc(sysfilesearch)

 		    if (!lbuf)

 			rc = 2;

 		    else {

-			i = sprintf(lbuf, "%d:", lines);

+			i = sprintf((char *) lbuf, "%d:", lines);

                         memcpy(lbuf+i, bol, eol-bol);

                         i += eol - bol;

                         if (lbuf[i-1] == '\r')

                            i--;

-			if (cha_addstr(array, lbuf, i))

+			if (cha_addstr(array, (char *) lbuf, i))

 			    rc = 2;

 		    }

 		}

@@ -222,7 +223,7 @@ rxfunc(sysfilesearch)

         if (lbuf)

            free(lbuf);

-        unmapfile(buf, len);

+        unmapfile((char *) buf, len);

     }

     result->strlength = sprintf(result->strptr, "%d", rc);

@@ -730,8 +731,8 @@ rxfunc(sysfiletree)

 	rc = 2;

     else {

-	/* break the list into directory & pattern, so the input can be of

-	 * the form /usr/home/ptjm/*.c */

+//	break the list into directory & pattern, so the input can be of

+//	the form /usr/home/ptjm/*.c

 	dir = pattern;

 	pattern = strrchr(dir, '/');

--- regini.c.orig	2004-07-19 00:09:52 UTC

+++ regini.c

@@ -1002,7 +1002,7 @@ rxfunc(sysgeterrortext)

       result->strlength = 0;

    }

 #else

-   if (rcs = strerror(rc)) {

+   if ((rcs = strerror(rc))) {

       result->strlength = strlen(rcs);

       memcpy(result->strptr, rcs, result->strlength);

    }

--- regstem.c.orig	2004-06-15 19:15:06 UTC

+++ regstem.c

@@ -53,7 +53,7 @@ static int rxstrcasecmp(const PRXSTRING 

 {

    register int len = min(l->strlength, r->strlength),

                 d = l->strlength - r->strlength,

-                c = casecmp(l->strptr, r->strptr, len);

+                c = casecmp((unsigned char *) l->strptr, (unsigned char *) r->strptr, len);

    return (len && c) ? c : d;

 }

--- regunicode.c.orig	2003-04-01 20:08:34 UTC

+++ regunicode.c

@@ -542,10 +542,10 @@ rxfunc(systounicode)

    /* for the same reason, perform utf-7 and utf-8 conversions here, rather

     * than using iconv() */

    else if (cp == CP_UTF7) {

-      outs.strlength = u7tou((unsigned short *)outs.strptr,  argv[0].strptr, argv[0].strlength);

+      outs.strlength = u7tou((unsigned short *)outs.strptr,  (unsigned char *) argv[0].strptr, argv[0].strlength);

    }

    else if (cp == CP_UTF8) {

-      outs.strlength = u8tou((unsigned short *) outs.strptr, argv[0].strptr, argv[0].strlength);

+      outs.strlength = u8tou((unsigned short *) outs.strptr, (unsigned char *) argv[0].strptr, argv[0].strlength);

    }

    /* if requesting a specific code page, we need iconv, or we return an

@@ -719,10 +719,10 @@ rxfunc(sysfromunicode)

    /* for the same reason, perform utf-7 and utf-8 conversions here, rather

     * than using iconv() */

    else if (cp == CP_UTF7) {

-      outs.strlength = utou7(outs.strptr,  (unsigned short *)argv[0].strptr, argv[0].strlength/2);

+      outs.strlength = utou7((unsigned char *) outs.strptr,  (unsigned short *)argv[0].strptr, argv[0].strlength/2);

    }

    else if (cp == CP_UTF8) {

-      outs.strlength = utou8(outs.strptr, (unsigned short *)argv[0].strptr, argv[0].strlength/2);

+      outs.strlength = utou8((unsigned char *) outs.strptr, (unsigned short *)argv[0].strptr, argv[0].strlength/2);

    }

    /* if requesting a specific code page, we need iconv, or we return an

--- regutil.c.orig	2004-01-16 14:57:12 UTC

+++ regutil.c

@@ -52,7 +52,7 @@ static void gettimeofday(struct timeval 

 struct {

     char * name;

-    APIRET (APIENTRY*funcptr)(PUCHAR fname, ULONG argc, PRXSTRING argv, PSZ pSomething, PRXSTRING result);

+    APIRET (APIENTRY*funcptr)(PCSZ fname, ULONG argc, PRXSTRING argv, PCSZ pSomething, PRXSTRING result);

 } funclist[] = {

     {"SYSADDREXXMACRO", sysaddrexxmacro},

     {"SYSCLEARREXXMACROSPACE", sysclearrexxmacrospace},

--- rxproto.h.orig	2003-05-23 11:05:50 UTC

+++ rxproto.h

@@ -53,7 +53,7 @@

  * to something else, and a pointer to the result string.

  * It returns 0 for success, and some other value for failure */

-#define rxfunc(x) APIRET APIENTRY x(PUCHAR fname, ULONG argc, PRXSTRING argv, PSZ pSomething, PRXSTRING result)

+#define rxfunc(x) APIRET APIENTRY x(PCSZ fname, ULONG argc, PRXSTRING argv, PCSZ pSomething, PRXSTRING result)

 /* return codes. 22 is rc for invalid call */

 #define NOMEMORY 5

--- rxsupport.c.orig	2003-09-10 21:09:44 UTC

+++ rxsupport.c

@@ -612,7 +612,7 @@ int cha_adddummy(chararray *ca, const ch

     }

     ca->array[ca->count].strlength = len;

-    ca->array[ca->count++].strptr = (unsigned char *)str;

+    ca->array[ca->count++].strptr = (char *)str;

     return 0;

 }

As it stands,

.Nm

will not work with another REXX interpreter.

(if installed).