Revision: 37297 http://trac.macosforge.org/projects/macports/changeset/37297 Author: takanori@macports.org Date: 2008-06-02 11:33:03 -0700 (Mon, 02 Jun 2008) Log Message: ----------- FDclone: alias command didn't work properly in 3.00 (see [FDclone-users:00785]) Modified Paths: -------------- trunk/dports/sysutils/FDclone/Portfile Added Paths: ----------- trunk/dports/sysutils/FDclone/files/patch-posixsh.c.diff trunk/dports/sysutils/FDclone/files/patch-string.c.diff Modified: trunk/dports/sysutils/FDclone/Portfile =================================================================== --- trunk/dports/sysutils/FDclone/Portfile 2008-06-02 17:14:00 UTC (rev 37296) +++ trunk/dports/sysutils/FDclone/Portfile 2008-06-02 18:33:03 UTC (rev 37297) @@ -4,6 +4,7 @@ name FDclone version 3.00 +revision 1 categories sysutils shells maintainers takanori description File & Directory Maintenance Tool @@ -14,7 +15,8 @@ master_sites http://hp.vector.co.jp/authors/VA012337/soft/fd/ \ ftp://ftp.unixusers.net/src/fdclone/ distname FD-${version} -patchfiles patch-Makefile.in.diff +patchfiles patch-Makefile.in.diff \ + patch-posixsh.c.diff patch-string.c.diff checksums md5 cff2b9b74edd56324958382ef11c7d35 \ sha1 ceacb42d260654e19bdcaf0b129a3666743f5b57 \ rmd160 3b67b364f12479ff540ac30d94ecb7dea53be095 Added: trunk/dports/sysutils/FDclone/files/patch-posixsh.c.diff =================================================================== --- trunk/dports/sysutils/FDclone/files/patch-posixsh.c.diff (rev 0) +++ trunk/dports/sysutils/FDclone/files/patch-posixsh.c.diff 2008-06-02 18:33:03 UTC (rev 37297) @@ -0,0 +1,21 @@ +--- ./posixsh.c.orig 2008-05-31 00:00:00.000000000 +0900 ++++ ./posixsh.c 2008-06-03 03:23:20.000000000 +0900 +@@ -513,7 +513,8 @@ + && !(statementlist[i].type & STT_NEEDLIST))) + return(-1); + +- if ((!strchr2(IFS_SET, delim) && !strchr2(ALIASDELIMIT, delim))) ++ if (delim ++ && (!strchr2(IFS_SET, delim) && !strchr2(ALIASDELIMIT, delim))) + return(-1); + i = searchalias(ident, len); + if (!(shellalias[i].ident) || (shellalias[i].flags & AL_USED)) +@@ -559,7 +560,7 @@ + else if (s[ptr] == '(') { + if ((ptr = evalexpression(s, ptr + 1, resultp, 9)) < 0) + return(-1); +- while (strchr2(IFS_SET, s[ptr])) ptr++; ++ while (s[ptr] && strchr2(IFS_SET, s[ptr])) ptr++; + if (s[ptr++] != ')') return(-1); + } + else if (isdigit2(s[ptr])) { Added: trunk/dports/sysutils/FDclone/files/patch-string.c.diff =================================================================== --- trunk/dports/sysutils/FDclone/files/patch-string.c.diff (rev 0) +++ trunk/dports/sysutils/FDclone/files/patch-string.c.diff 2008-06-02 18:33:03 UTC (rev 37297) @@ -0,0 +1,47 @@ +--- ./string.c.orig 2008-05-31 00:00:00.000000000 +0900 ++++ ./string.c 2008-06-03 03:23:20.000000000 +0900 +@@ -13,34 +13,32 @@ + CONST char *s; + int c; + { +- int i; +- +- for (i = 0; s[i]; i++) { +- if (s[i] == c) return((char *)&(s[i])); +- if (iskanji1(s, i)) i++; ++ for (; *s != c; s++) { ++ if (!*s) return(NULL); ++ if (iskanji1(s, 0)) s++; + #ifdef CODEEUC +- else if (isekana(s, i)) i++; ++ else if (isekana(s, 0)) s++; + #endif + } + +- return(NULL); ++ return((char *)s); + } + + char *strrchr2(s, c) + CONST char *s; + int c; + { +- int i; + char *cp; + + cp = NULL; +- for (i = 0; s[i]; i++) { +- if (s[i] == c) cp = (char *)&(s[i]); +- if (iskanji1(s, i)) i++; ++ for (; *s; s++) { ++ if (*s == c) cp = (char *)s; ++ if (iskanji1(s, 0)) s++; + #ifdef CODEEUC +- else if (isekana(s, i)) i++; ++ else if (isekana(s, 0)) s++; + #endif + } ++ if (!c) cp = (char *)s; + + return(cp); + }