naruse	2008-05-22 06:23:51 +0900 (Thu, 22 May 2008)

  New Revision: 16515

  Modified files:
    trunk/ChangeLog
    trunk/ext/nkf/nkf-utf8/nkf.c

  Log:
    * ext/nkf/nkf-utf8/nkf.c (nkf_str_caseeql): added.
    
    * ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index): use nkf_str_caseeql.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16515&r2=16514&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ext/nkf/nkf-utf8/nkf.c?r1=16515&r2=16514&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16514)
+++ ChangeLog	(revision 16515)
@@ -1,3 +1,9 @@
+Thu May 22 06:21:34 2008  NARUSE, Yui  <naruse@r...>
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_str_caseeql): added.
+
+	* ext/nkf/nkf-utf8/nkf.c (nkf_enc_find_index): use nkf_str_caseeql.
+
 Thu May 22 05:45:30 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* proc.c (proc_dup): should copy safe_level from src proc
Index: ext/nkf/nkf-utf8/nkf.c
===================================================================
--- ext/nkf/nkf-utf8/nkf.c	(revision 16514)
+++ ext/nkf/nkf-utf8/nkf.c	(revision 16515)
@@ -653,14 +653,15 @@
 nkf_char std_gc_buf[STD_GC_BUFSIZE];
 nkf_char std_gc_ndx;
 
-static void
-nkf_str_upcase(const char *src, char *dest, size_t length)
+static int
+nkf_str_caseeql(const char *src, const char *target)
 {
-    int i = 0;
-    for (; i < length && src[i]; i++) {
-	dest[i] = nkf_toupper(src[i]);
+    int i;
+    for (i = 0; src[i] && target[i]; i++) {
+	if (nkf_toupper(src[i]) != nkf_toupper(target[i])) return FALSE;
     }
-    dest[i] = 0;
+    if (src[i] || target[i]) return FALSE;
+    else return TRUE;
 }
 
 static nkf_encoding*
@@ -675,14 +676,14 @@
 static int
 nkf_enc_find_index(const char *name)
 {
-    int i, index = -1;
-    if (*name == 'X' && *(name+1) == '-') name += 2;
+    int i;
+    if (name[0] == 'X' && *(name+1) == '-') name += 2;
     for (i = 0; encoding_name_to_id_table[i].id >= 0; i++) {
-	if (strcasecmp(name, encoding_name_to_id_table[i].name) == 0) {
+	if (nkf_str_caseeql(encoding_name_to_id_table[i].name, name)) {
 	    return encoding_name_to_id_table[i].id;
 	}
     }
-    return index;
+    return -1;
 }
 
 static nkf_encoding*
@@ -914,8 +915,7 @@
 	}
 	backup_filename[j] = '\0';
     }else{
-	j = strlen(suffix) + filename_length;
-	backup_filename = malloc( + 1);
+	backup_filename = malloc(filename_length + strlen(suffix) + 1);
 	strcpy(backup_filename, filename);
 	strcat(backup_filename, suffix);
 	backup_filename[j] = '\0';
@@ -5693,7 +5693,6 @@
     nkf_char i, j;
     unsigned char *p;
     unsigned char *cp_back = NULL;
-    char codeset[32];
     nkf_encoding *enc;
 
     if (option_mode==1)
@@ -5733,15 +5732,13 @@
 		cp = (unsigned char *)long_option[i].alias;
 	    }else{
 		if (strcmp(long_option[i].name, "ic=") == 0){
-		    nkf_str_upcase((char *)p, codeset, 32);
-		    enc = nkf_enc_find(codeset);
+		    enc = nkf_enc_find((char *)p);
 		    if (!enc) continue;
 		    input_encoding = enc;
 		    continue;
 		}
 		if (strcmp(long_option[i].name, "oc=") == 0){
-		    nkf_str_upcase((char *)p, codeset, 32);
-		    enc = nkf_enc_find(codeset);
+		    enc = nkf_enc_find((char *)p);
 		    if (enc <= 0) continue;
 		    output_encoding = enc;
 		    continue;
@@ -6490,6 +6487,7 @@
 			    fprintf(stderr, "Can't rename %s to %s\n",
 				    origfname, backup_filename);
 			}
+			free(backup_filename);
 		    }else{
 #ifdef MSDOS
 			if (unlink(origfname)){

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/