check in the patch submit by Jonas Utterstrom <jonas.utterstrom@vittran.norrnod.se in message news://news.mozilla.org/381B3757.FEC144BC%40vittran.norrnod.se fix bug 17706. r=ftang

intl/uconv/tests/nsconv.cpp

@@ -17,12 +17,18 @@
  * Netscape Communications Corporation.  All Rights Reserved.
  */
 
+// Utility that converts file encoded in one charset codepage to
+// another encoding
+
 #include "nscore.h"
 #include "nsString.h"
 #include "nsIServiceManager.h"
 #include "nsICharsetConverterManager.h"
 #include "nsIUnicodeEncoder.h"
 #include "nsIUnicodeDecoder.h"
+
+#include "nsICharsetAlias.h"
+
 static NS_DEFINE_CID(kCharsetConverterManagerCID, NS_ICHARSETCONVERTERMANAGER_CID);
 static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_IID);
 
@@ -32,103 +38,182 @@ static NS_DEFINE_IID(kICharsetConverterManagerIID, NS_ICHARSETCONVERTERMANAGER_I
 void usage()
 {
   printf(
-"nsconv -f fromcode -t tocode infile outfile\n"
+    "nsconv -f fromcode -t tocode infile outfile\n"
+    "nsconv -f fromcode -t tocode infile > outfile\n"
+    "nsconv -f fromcode -t tocode < infile > outfile\n"
     );
 }
-int fromcodeind = 0;
-int tocodeind = 0;
-FILE* infile = 0;
-FILE* outfile = 0;
+
 #define INBUFSIZE (1024*16)
 #define MEDBUFSIZE (1024*16*2)
 #define OUTBUFSIZE (1024*16*8)
 char inbuffer[INBUFSIZE];
 char outbuffer[OUTBUFSIZE];
 PRUnichar  medbuffer[MEDBUFSIZE];
-nsIUnicodeEncoder* encoder = nsnull;
-nsIUnicodeDecoder* decoder = nsnull;
 
 int main(int argc, const char** argv)
 {
+  nsIUnicodeEncoder* encoder = nsnull;
+  nsIUnicodeDecoder* decoder = nsnull;
+  FILE* fin = 0;
+  FILE* fout = 0;
+  FILE* infile = 0;
+  FILE* outfile = 0;
   nsresult res= NS_OK;
   nsICharsetConverterManager* ccMain=nsnull;
+  nsICharsetAlias* aliasmgr = nsnull;
+
   // get ccMain;
-   nsServiceManager::GetService(kCharsetConverterManagerCID,
+  res = nsServiceManager::GetService(kCharsetConverterManagerCID,
                                      kICharsetConverterManagerIID, (nsISupports**) &ccMain);
   if(NS_FAILED(res))
   {
     fprintf(stderr, "Cannot get Character Converter Manager %x\n", res);
+    return -1;
   }
+
+  // Get the charset alias manager
+  res = nsServiceManager::GetService(NS_CHARSETALIAS_PROGID, nsICharsetAlias::GetIID(),
+                                     (nsISupports**) &aliasmgr);
+  if (NS_FAILED(res))
+  {
+    fprintf(stderr, "Cannot get Charset Alias Manager %x\n", res);
+    nsServiceManager::ReleaseService(kCharsetConverterManagerCID, ccMain);
+    return -1;
+  }
+
   int i;
-   if(argc > 6)
+  if(argc > 4)
   {
     for(i =0; i < argc; i++)
     {
       if(strcmp(argv[i], "-f") == 0)
       {
-             tocodeind = i+1;
-             nsAutoString str(argv[tocodeind]);
+        // User has specified the charset to convert from
+        nsAutoString str;
+
+        // First check if a charset alias was given, 
+        // and convert to the canonical name
+        res = aliasmgr->GetPreferred(argv[i+1], str);
+        if (NS_FAILED(res))
+        {
+          fprintf(stderr, "Cannot get charset alias for %s %x\n",
+                  argv[i+1], res);
+          goto error_exit;
+        }
+
+        // Finally create the decoder
         res = ccMain->GetUnicodeDecoder(&str, &decoder);
         if(NS_FAILED(res)) {
           fprintf(stderr, "Cannot get Unicode decoder %s %x\n", 
-			argv[tocodeind],res);
-  		return -1;
+                  argv[i+1],res);
+          goto error_exit;
         }
 
       }
+
       if(strcmp(argv[i], "-t") == 0)
       {
-             fromcodeind = i+1;
-             nsAutoString str(argv[fromcodeind]);
+        // User has specified which charset to convert to
+        nsAutoString str;
+
+        // First check if a charset alias was given, 
+        // and convert to the canonical name
+        res = aliasmgr->GetPreferred(argv[i+1], str);
+        if (NS_FAILED(res))
+        {
+          fprintf(stderr, "Cannot get charset alias for %s %x\n",
+                  argv[i+1], res);
+          goto error_exit;
+        }
+
+        // Finally create the encoder 
         res = ccMain->GetUnicodeEncoder(&str, &encoder);
         if(NS_FAILED(res)) {
           fprintf(stderr, "Cannot get Unicode encoder %s %x\n", 
-			argv[fromcodeind],res);
-  		return -1;
+                  argv[i+1],res);
+          goto error_exit;
         }
       }
     }
-        infile = fopen(argv[5], "rb");
+
+    if (argc > 5)
+    {
+      // The user has specified an input file 
+      // if we have more than four arguments
+      fin = infile = fopen(argv[5], "rb");
       if(NULL == infile) 
       {  
         usage();
         fprintf(stderr,"cannot open input file %s\n", argv[5]);
-           return -1; 
+        goto error_exit; 
       }
-        outfile = fopen(argv[6], "ab");
+
+      if (argc > 6)
+      {
+        // The user has specified an output file
+        // if we have more than four arguments
+        fout = outfile = fopen(argv[6], "ab");
         if(NULL == outfile) 
         {  
           usage();
           fprintf(stderr,"cannot open output file %s\n", argv[6]);
-           return -1; 
+          goto error_exit; 
+        }
+      }
+      else
+        fout = stdout;
+    }
+    else
+    {
+      // No inputfiles are given. Read and write
+      // to/from standard in and standard out
+      fin = stdin;
+      fout = stdout;
     }
     
-    
     PRInt32 insize,medsize,outsize;
-     while((insize=fread(inbuffer, 1,INBUFSIZE,infile)) > 0)
+    while((insize=fread(inbuffer, 1,INBUFSIZE, fin)) > 0)
     {
       medsize=MEDBUFSIZE;
         
       res = decoder->Convert(inbuffer,&insize, medbuffer, &medsize);
       if(NS_FAILED(res)) {
         fprintf(stderr, "failed in decoder->Convert %x\n",res);
-	    return -1;
+        goto error_exit;
       }
       outsize = OUTBUFSIZE;
       res = encoder->Convert(medbuffer, &medsize, outbuffer,&outsize);
       if(NS_FAILED(res)) {
         fprintf(stderr, "failed in encoder->Convert %x\n",res);
-	    return -1;
+        goto error_exit;
       }
-        fwrite(outbuffer, 1, outsize, outfile);
+      fwrite(outbuffer, 1, outsize, fout);
 
     }
      
+    // Clean up 
+    if (infile != 0)
       fclose(infile);
+    if (outfile != 0)
       fclose(outfile);
     fprintf(stderr, "Done!\n");
+    NS_IF_RELEASE(encoder);
+    NS_IF_RELEASE(decoder);
+    nsServiceManager::ReleaseService(kCharsetConverterManagerCID, ccMain);
+    nsServiceManager::ReleaseService(NS_CHARSETALIAS_PROGID, aliasmgr);
     return 0;
   }
   usage();
+  error_exit:
+  // Clean up after
+  if (infile != 0)
+    fclose(infile);
+  if (outfile != 0)
+    fclose(outfile);
+  NS_IF_RELEASE(encoder);
+  NS_IF_RELEASE(decoder);
+  nsServiceManager::ReleaseService(kCharsetConverterManagerCID, ccMain);
+  nsServiceManager::ReleaseService(NS_CHARSETALIAS_PROGID, aliasmgr);
   return -1;
 }