[ViewVC] Diff of: cvs/rxvt-unicode/src/command.C

Comparing rxvt-unicode/src/command.C (file contents):
Revision 1.414 by ayin, Tue Feb 19 10:47:03 2008 UTC vs.
Revision 1.416 by root, Tue Jul 15 16:41:22 2008 UTC

           cmdbuf_ptr = cmdbuf_endp;
           break;
         }
       if (len == (size_t)-1)
+        {
+          mbrtowc (0, 0, 0, mbstate); // reset now undefined conversion state
-        return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+          return (unsigned char)*cmdbuf_ptr++; // the _occasional_ latin1 character is allowed to slip through
+        }
       // assume wchar == unicode
       cmdbuf_ptr += len;
       return wc & UNICODE_MASK;
     }
 /*----------------------------------------------------------------------*/
 #ifdef PRINTPIPE
 FILE *
 rxvt_term::popen_printer ()
 {
-  FILE *stream = popen (rs[Rs_print_pipe], "w");
+  FILE *stream = popen (rs[Rs_print_pipe] ? rs[Rs_print_pipe] : PRINTPIPE, "w");
   if (stream == NULL)
     rxvt_warn ("can't open printer pipe, not printing.\n");
   return stream;
  * simulate attached vt100 printer
  */
 void
 rxvt_term::process_print_pipe ()
 {
-  int done;
+  FILE *fd = popen_printer ();
-  FILE *fd;
-  if ((fd = popen_printer ()) == NULL)
+  if (!fd)
     return;
   /*
    * Send all input to the printer until either ESC[4i or ESC[?4i
    * is received.
    */
-  for (done = 0; !done;)
+  for (int done = 0; !done; )
     {
       unsigned char buf[8];
       unicode_t ch;
       unsigned int i, len;

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines