Hello community, here is the log from the commit of package qprint for openSUSE:Factory checked in at 2015-03-25 21:05:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qprint (Old) and /work/SRC/openSUSE:Factory/.qprint.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qprint" Changes: -------- --- /work/SRC/openSUSE:Factory/qprint/qprint.changes 2013-01-07 17:37:54.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.qprint.new/qprint.changes 2015-03-25 21:33:21.000000000 +0100 @@ -1,0 +2,8 @@ +Sat Mar 14 00:22:52 UTC 2015 - [email protected] + +- Update to version 1.1 + * No changelog available +- Use %configure macro +- Enable parallel building with %{?_smp_mflags} + +------------------------------------------------------------------- Old: ---- qprint-1.0.tar.gz New: ---- qprint-1.1.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qprint.spec ++++++ --- /var/tmp/diff_new_pack.DwPdXL/_old 2015-03-25 21:33:21.000000000 +0100 +++ /var/tmp/diff_new_pack.DwPdXL/_new 2015-03-25 21:33:21.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package qprint # -# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ Name: qprint -Version: 1.0 +Version: 1.1 Release: 0 Summary: Command line utility which encodes and decodes files in this format License: SUSE-Public-Domain @@ -33,8 +33,8 @@ %setup -q %build -CFLAGS="%{optflags}" ./configure --prefix=%{_prefix} --mandir=%{_mandir}/ -make +%configure +make %{?_smp_mflags} %install mkdir -p %{buildroot}%{_bindir} ++++++ qprint-1.0.tar.gz -> qprint-1.1.tar.gz ++++++ ++++ 7138 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qprint-1.0/README new/qprint-1.1/README --- old/qprint-1.0/README 2001-03-07 23:16:07.000000000 +0100 +++ new/qprint-1.1/README 2014-12-16 23:32:12.000000000 +0100 @@ -1,9 +1,9 @@ - Q R R I N T + Q P R I N T by John Walker (http://www.fourmilab.ch/) - Version 1.0 - March 2001 + Version 1.1 + December 2014 QPRINT is a simple command-line filter which encodes and decodes files in Quoted-Printable encoding as defined in RFC 1521. For diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qprint-1.0/configure.in new/qprint-1.1/configure.in --- old/qprint-1.0/configure.in 2001-03-01 15:30:50.000000000 +0100 +++ new/qprint-1.1/configure.in 2014-12-16 22:36:54.000000000 +0100 @@ -4,7 +4,7 @@ AC_PREFIX_DEFAULT(/usr/local) PRODUCT=qprint -VERSION=1.0 +VERSION=1.1 AC_DEFINE_UNQUOTED(PRODUCT, "$PRODUCT") AC_DEFINE_UNQUOTED(VERSION, "$VERSION") AC_SUBST(PRODUCT) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qprint-1.0/index.html new/qprint-1.1/index.html --- old/qprint-1.0/index.html 2001-03-05 23:25:06.000000000 +0100 +++ new/qprint-1.1/index.html 2005-12-21 21:15:16.000000000 +0100 @@ -1,29 +1,36 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> -<html version="-//W3C//DTD HTML 3.2 Final//EN"> +<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd";> +<html xmlns="http://www.w3.org/1999/xhtml"; xml:lang="en" lang="en"> <head> <title>QPRINT: Encode and Decode Quoted-Printable Files</title> <style type="text/css"> - DIV.bodycopy { + body { margin-left: 15%; - margin-right: 10% + margin-right: 10%; + background-color: #FFFFFF; + color: #000000; + } + + dt { + margin-top: 1ex; } </style> -<meta name="keywords" content="qprint, encode, decode, utility, RFC 1521, MIME"> -<meta name="description" content="qprint: Encode and Decode Quoted-Printable Files"> -<meta name="author" content="John Walker"> -<meta name="robots" content="index"> -<meta name="robots" content="nofollow"> +<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" /> +<meta name="keywords" content="qprint, encode, decode, utility, RFC 1521, MIME" /> +<meta name="description" content="qprint: Encode and Decode Quoted-Printable Files" /> +<meta name="author" content="John Walker" /> +<meta name="robots" content="index" /> +<meta name="robots" content="nofollow" /> </head> -<body bgcolor="#FFFFFF"> +<body> <center> -<h1><img src="logo.gif" width=491 height=181 alt="qprint: Encode and Decode Quoted-Printable Files"></h1> +<h1><img src="qprint.png" width="491" height="181" + alt="qprint: Encode and Decode Quoted-Printable Files" /></h1> </center> -<hr> - -<div class="bodycopy"> +<hr /> <p> @@ -33,6 +40,7 @@ which encodes binary files in the "Quoted-Printable" format used by MIME-encoded documents such as electronic mail messages with embedded images and audio files. +</p> <h3>NAME</h3> <blockquote> @@ -47,6 +55,7 @@ <h3>DESCRIPTION</h3> +<p> The MIME (Multipurpose Internet Mail Extensions) specification (<a href="rfc1521.html">RFC 1521</a> and successors) defines a mechanism for encoding text consisting primarily @@ -55,9 +64,9 @@ character set) which cannot be encoded as 7-bit ASCII or are non-printable characters which may confuse mail transfer agents. +</p> <p> - <b>qprint</b> is a command line utility which encodes and decodes files in this format. It can be used within a pipeline as an encoding or decoding filter, @@ -67,37 +76,47 @@ inflate the size of the file by as much as a factor of three. The <a href="../base64/"><b>base64</b></a> MIME encoding is a better choice for such data. - +</p> <h3>OPTIONS</h3> -<dl compact> +<dl compact="compact"> -<dt><b>-b</b>, <b>--binary</b><dd> +<dt><b>-b</b>, <b>--binary</b></dt> +<dd> Treat the input (when encoding) or output (when decoding) file as pure binary, and process end of line sequences as binary data. Encoding and decoding a file with this option preserves the exact sequence of bytes in the input, but does not perform the translation of end of line sequences normally performed by Quoted-Printable encoding. +</dd> -<p><dt><b>--copyright</b><dd> +<dt><b>--copyright</b></dt> +<dd> Print copyright information. +</dd> -<p><dt><b>-d</b>, <b>--decode</b><dd> -Decodes the input, previously created by -<b>qprint</b>, -to recover the original input file. - -<p><dt><b>-e</b>, <b>--encode</b><dd> +<dt><b>-d</b>, <b>--decode</b></dt> +<dd> +Decodes the input, previously created by <b>qprint</b>, to recover the +original input file. +</dd> + +<dt><b>-e</b>, <b>--encode</b></dt> +<dd> Encodes the input into an output text file containing its Quoted-Printable encoding. +</dd> -<p><dt><b>-i</b>, <b>--ebcdic</b><dd> +<dt><b>-i</b>, <b>--ebcdic</b></dt> +<dd> Encode ASCII characters for which no equivalent exists in the EBCDIC character set. This renders files more portable when transported to EBCDIC systems. - -<p><dt><b>-n</b>, <b>--noerrcheck</b> <dd> +</dd> + +<dt><b>-n</b>, <b>--noerrcheck</b></dt> +<dd> Suppress error checking when decoding. By default, if an incorrectly encoded escape sequence is encountered, a warning message is printed. This option suppresses @@ -105,8 +124,10 @@ improperly encoded file was read will be the program returning exit status 1 at the end of the input file. In either case, incorrect escape sequences are discarded. +</dd> -<p><dt><b>-p</b>, <b>--paranoid</b> <dd> +<dt><b>-p</b>, <b>--paranoid</b></dt> +<dd> Every character in the input file will be encoded as an escape sequence. You must also specify the <b>-b</b> or <b>--binary</b> option if you wish end of line sequences @@ -115,24 +136,30 @@ explicitly designed for binary data such as <a href="../base64/">Base64</a> is a much more economical choice. - -<p><dt><b>-u</b>, <b>--help</b> <dd> Print how to call information and a summary of - options. +</dd> -<p><dt><b>--version</b> <dd>Print program version information. +<dt><b>-u</b>, <b>--help</b></dt> +<dd> Print how to call information and a summary of options. +</dd> + +<dt><b>--version</b></dt> +<dd>Print program version information. +</dd> </dl> <h3>EXIT STATUS</h3> -<b>qprint</b> -returns status 0 if processing was completed without errors, 1 if an -I/O error occurred or errors were detected in decoding a file which -indicate it is incorrect or incomplete, and 2 if processing -could not be performed at all due, for example, to a nonexistent input -file. +<p> +<b>qprint</b> returns status 0 if processing was completed without +errors, 1 if an I/O error occurred or errors were detected in decoding +a file which indicate it is incorrect or incomplete, and 2 if +processing could not be performed at all due, for example, to a +nonexistent input file. +</p> <h3><a name="files">FILES</a></h3> +<p> If no <i>infile</i> is specified or <i>infile</i> is a single "-", <b>qprint</b> reads from standard input; if no <i>outfile</i> is given, or <i>outfile</i> is a single "-", output is sent to standard @@ -140,32 +167,40 @@ consequently <b>qprint</b> may be used in pipelines. The program can process files of any size supported by the system containing text lines of arbitrary length. - +</p> <h3>BUGS</h3> +<p> Encoding a file with a large percentage of non-ASCII characters may dramatically increase its size. This is inherent in the design of Quoted-Printable encoding. +</p> <h3>SEE ALSO</h3> - <a href="../base64/"><b>base64</b></a>(1), <a href="rfc1521.html">RFC 1521</a> + <a href="../base64/"><b>base64</b></a>(1), + <a href="rfc1521.html" target="_blank">RFC 1521</a> -<h2><a name="Download" href="qprint-1.0.tar.gz"><img src="/images/icons/file.gif" alt="" align=middle width=40 height=40></a> <a href="qprint-1.0.tar.gz">Download qprint-1.0.tar.gz</a> (Gzipped TAR archive)</h2> +<h2><a name="Download" href="qprint-1.0.tar.gz"><img src="/images/icons/file.gif" + alt="" align="middle" width="40" height="40" border="0" /></a> + <a href="qprint-1.0.tar.gz">Download qprint-1.0.tar.gz</a> (Gzipped TAR archive)</h2> +<p> The archive contains source code for the utility, a Makefile for Unix systems, and a ready-to-run executable for 32-bit Windows platforms. Windows users may also download <a href="qprint.zip"><b><tt>qprint.zip</tt></b></a>, a ZIPped archive containing the Windows executable. +</p> + +<h3><a href="qprint.pdf">Read <b>qprint</b> source code</a> (requires + <a href="http://www.adobe.com/acrobat/readstep.html"; target="_blank">Acrobat Reader</a>)</h3> <h3>AUTHOR</h3> <address> - <a href="/">John Walker</a> -<br> + <a href="/">John Walker</a><br /> <a href="/">http://www.fourmilab.ch/</a> </address> -<p> <blockquote> This software is in the public domain. Permission to use, copy, modify, and distribute this software and its documentation for @@ -174,16 +209,30 @@ without express or implied warranty. </blockquote> -</div> - -<p> -<hr> -<p> +<p /> +<hr /> +<p /> +<table align="right"> +<tr><td align="center"> +<form name="feedback" method="post" action="/cgi-bin/FeedbackForm.pl"> +<input type="hidden" name="pagetitle" value="<cite>Qprint</cite>" /> +<input type="hidden" name="backlink" value="Back to <cite>Qprint</cite>" /> +<input type="submit" value=" Send Feedback " /> +</form> +</td></tr> +<tr><td align="center"> + <a href="http://validator.w3.org/check?uri=referer"; + target="FourmilabValidation"><img + src="/images/icons/valid-xhtml10.png" + alt="Valid XHTML 1.0" height="31" width="88" + border="0" /></a> +</td></tr> +</table> <address> -by <a href="/">John Walker</a><br> -5th March 2001<br> -Version 1.0<br> -The latest version of this program is available from: +by <a href="/">John Walker</a><br /> +5th March 2001<br /> +Version 1.0<br /> +The latest version of this program is available from:<br /> <a href="http://www.fourmilab.ch/webtools/qprint/";>http://www.fourmilab.ch/webtools/qprint/</a>. </address> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qprint-1.0/qprint.1 new/qprint-1.1/qprint.1 --- old/qprint-1.0/qprint.1 2001-03-05 23:24:53.000000000 +0100 +++ new/qprint-1.1/qprint.1 2014-12-16 23:38:38.000000000 +0100 @@ -1,4 +1,4 @@ -.TH qprint 1 "5 MAR 2001" +.TH qprint 1 "16 DEC 2014" .UC 4 .SH NAME qprint \- encode / decode file as RFC 1521 MIME Quoted-Printable @@ -143,7 +143,7 @@ without any conditions or restrictions. This software is provided ``as is'' without express or implied warranty. .PP -This is version 1.0 of +This is version 1.1 of .BR qprint . The current version of this program may be downloaded from http://www.fourmilab.ch/webtools/qprint. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qprint-1.0/qprint.c new/qprint-1.1/qprint.c --- old/qprint-1.0/qprint.c 2001-03-06 00:06:40.000000000 +0100 +++ new/qprint-1.1/qprint.c 2014-12-16 23:12:20.000000000 +0100 @@ -1,9 +1,9 @@ /*2:*/ -#line 70 "qprint.w" +#line 70 "./qprint.w" #include "config.h" -#define REVDATE "5th March 2001" \ +#define REVDATE "16th December 2014" \ #define TRUE 1 #define FALSE 0 @@ -23,11 +23,11 @@ #define Character_is_printable_ISO_8859(c) (((((c) >=0x20) &&((c) <=0x7E) ) ||((c) >=0xA1) ) ) \ -#line 73 "qprint.w" +#line 73 "./qprint.w" /*4:*/ -#line 100 "qprint.w" +#line 100 "./qprint.w" #include <stdio.h> #include <stdlib.h> @@ -48,10 +48,10 @@ #endif /*:4*/ -#line 75 "qprint.w" +#line 75 "./qprint.w" /*5:*/ -#line 122 "qprint.w" +#line 122 "./qprint.w" #ifdef _WIN32 #define FORCE_BINARY_IO @@ -60,10 +60,10 @@ #endif /*:5*/ -#line 76 "qprint.w" +#line 76 "./qprint.w" /*6:*/ -#line 134 "qprint.w" +#line 134 "./qprint.w" typedef unsigned char byte; @@ -71,24 +71,24 @@ static FILE*fo; /*:6*//*13:*/ -#line 240 "qprint.w" +#line 240 "./qprint.w" typedef enum{Rule_1,Rule_2,Rule_3,Rule_4,Rule_EBCDIC} character_encoding_rule; static character_encoding_rule character_class[256]; /*:13*//*22:*/ -#line 409 "qprint.w" +#line 409 "./qprint.w" static int current_line_length= 0; /*:22*//*23:*/ -#line 425 "qprint.w" +#line 425 "./qprint.w" static int pending_white_space= 0; /*:23*//*32:*/ -#line 591 "qprint.w" +#line 608 "./qprint.w" #if (SIZEOF_UNSIGNED_LONG == 8) || (SIZEOF_UNSIGNED_LONG_LONG == 0) @@ -108,13 +108,13 @@ #endif /*:32*//*33:*/ -#line 620 "qprint.w" +#line 637 "./qprint.w" static file_address_type decode_input_stream_position= 0; static long decode_errors= 0; /*:33*//*44:*/ -#line 796 "qprint.w" +#line 813 "./qprint.w" static int decoding= FALSE; static int encoding= FALSE; @@ -124,24 +124,24 @@ static int paranoid= FALSE; /*:44*/ -#line 77 "qprint.w" +#line 77 "./qprint.w" /*34:*/ -#line 628 "qprint.w" +#line 645 "./qprint.w" static int read_decode_character(void); /*:34*//*36:*/ -#line 650 "qprint.w" +#line 667 "./qprint.w" static int hex_to_nybble(int ch); /*:36*/ -#line 78 "qprint.w" +#line 78 "./qprint.w" /*:2*//*8:*/ -#line 149 "qprint.w" +#line 149 "./qprint.w" static void output_line_break(void) { @@ -152,7 +152,7 @@ } /*:8*//*9:*/ -#line 170 "qprint.w" +#line 170 "./qprint.w" static void check_line_length(int chars_required) { @@ -164,7 +164,7 @@ } /*:9*//*10:*/ -#line 183 "qprint.w" +#line 183 "./qprint.w" static void emit_literally(int ch) { @@ -173,7 +173,7 @@ } /*:10*//*11:*/ -#line 194 "qprint.w" +#line 194 "./qprint.w" static void emit_hex_encoded(int ch) { @@ -190,7 +190,7 @@ } /*:11*//*12:*/ -#line 221 "qprint.w" +#line 221 "./qprint.w" static void encode(void) @@ -198,21 +198,21 @@ int i,ch; /*14:*/ -#line 253 "qprint.w" +#line 253 "./qprint.w" /*15:*/ -#line 265 "qprint.w" +#line 265 "./qprint.w" for(i= 0;i<=255;i++){ character_class[i]= Rule_1; } /*:15*/ -#line 255 "qprint.w" +#line 255 "./qprint.w" ; /*16:*/ -#line 273 "qprint.w" +#line 273 "./qprint.w" for(i= 33;i<=60;i++){ character_class[i]= Rule_2; @@ -223,28 +223,28 @@ } /*:16*/ -#line 256 "qprint.w" +#line 256 "./qprint.w" ; /*17:*/ -#line 285 "qprint.w" +#line 285 "./qprint.w" character_class[ASCII_HORIZONTAL_TAB]= Rule_3; character_class[ASCII_SPACE]= Rule_3; /*:17*/ -#line 257 "qprint.w" +#line 257 "./qprint.w" ; /*18:*/ -#line 295 "qprint.w" +#line 295 "./qprint.w" character_class[ASCII_LINE_FEED]= Rule_4; character_class[ASCII_CARRIAGE_RETURN]= Rule_4; /*:18*/ -#line 258 "qprint.w" +#line 258 "./qprint.w" ; /*19:*/ -#line 306 "qprint.w" +#line 306 "./qprint.w" character_class[33]= character_class[34]= @@ -262,21 +262,21 @@ character_class[126]= Rule_EBCDIC; /*:19*/ -#line 259 "qprint.w" +#line 259 "./qprint.w" ; /*:14*/ -#line 227 "qprint.w" +#line 227 "./qprint.w" ; while((ch= getc(fi))!=EOF){ /*20:*/ -#line 331 "qprint.w" +#line 331 "./qprint.w" switch(character_class[ch]){ case Rule_1: /*24:*/ -#line 434 "qprint.w" +#line 434 "./qprint.w" if(pending_white_space!=0){ emit_literally(pending_white_space); @@ -284,14 +284,14 @@ } /*:24*/ -#line 334 "qprint.w" +#line 334 "./qprint.w" ; emit_hex_encoded(ch); break; case Rule_2: /*24:*/ -#line 434 "qprint.w" +#line 434 "./qprint.w" if(pending_white_space!=0){ emit_literally(pending_white_space); @@ -299,7 +299,7 @@ } /*:24*/ -#line 339 "qprint.w" +#line 339 "./qprint.w" ; if(paranoid){ emit_hex_encoded(ch); @@ -313,7 +313,7 @@ emit_hex_encoded(ch); }else{ /*24:*/ -#line 434 "qprint.w" +#line 434 "./qprint.w" if(pending_white_space!=0){ emit_literally(pending_white_space); @@ -321,7 +321,7 @@ } /*:24*/ -#line 351 "qprint.w" +#line 351 "./qprint.w" ; pending_white_space= ch; } @@ -334,7 +334,7 @@ /*24:*/ -#line 434 "qprint.w" +#line 434 "./qprint.w" if(pending_white_space!=0){ emit_literally(pending_white_space); @@ -342,12 +342,12 @@ } /*:24*/ -#line 362 "qprint.w" +#line 362 "./qprint.w" ; emit_hex_encoded(ch); }else{ /*25:*/ -#line 449 "qprint.w" +#line 449 "./qprint.w" { int chn= getc(fi); @@ -364,7 +364,7 @@ } /*:25*/ -#line 365 "qprint.w" +#line 365 "./qprint.w" ; @@ -379,7 +379,7 @@ case Rule_EBCDIC: /*24:*/ -#line 434 "qprint.w" +#line 434 "./qprint.w" if(pending_white_space!=0){ emit_literally(pending_white_space); @@ -387,7 +387,7 @@ } /*:24*/ -#line 378 "qprint.w" +#line 378 "./qprint.w" ; @@ -400,11 +400,11 @@ } /*:20*/ -#line 230 "qprint.w" +#line 230 "./qprint.w" ; } /*24:*/ -#line 434 "qprint.w" +#line 434 "./qprint.w" if(pending_white_space!=0){ emit_literally(pending_white_space); @@ -412,10 +412,10 @@ } /*:24*/ -#line 232 "qprint.w" +#line 232 "./qprint.w" ; /*26:*/ -#line 471 "qprint.w" +#line 471 "./qprint.w" if(current_line_length> 0){ @@ -425,18 +425,18 @@ /*:26*/ -#line 233 "qprint.w" +#line 233 "./qprint.w" ; } /*:12*//*21:*/ -#line 395 "qprint.w" +#line 395 "./qprint.w" static int is_end_of_line_sequence(int ch) { if((ch==ASCII_CARRIAGE_RETURN)||(ch==ASCII_LINE_FEED)){ /*25:*/ -#line 449 "qprint.w" +#line 449 "./qprint.w" { int chn= getc(fi); @@ -453,7 +453,7 @@ } /*:25*/ -#line 399 "qprint.w" +#line 399 "./qprint.w" ; return TRUE; } @@ -461,7 +461,7 @@ } /*:21*//*28:*/ -#line 487 "qprint.w" +#line 487 "./qprint.w" static void decode(void) @@ -473,43 +473,46 @@ case ASCII_EQUAL_SIGN: /*29:*/ -#line 529 "qprint.w" +#line 529 "./qprint.w" ch1= read_decode_character(); /*31:*/ -#line 565 "qprint.w" +#line 579 "./qprint.w" while(/*30:*/ -#line 552 "qprint.w" +#line 566 "./qprint.w" ((ch1==ASCII_SPACE)||(ch1==ASCII_HORIZONTAL_TAB)) /*:30*/ -#line 566 "qprint.w" +#line 580 "./qprint.w" ){ ch1= read_decode_character(); if(is_end_of_line_sequence(ch1)){ break; } if(!/*30:*/ -#line 552 "qprint.w" +#line 566 "./qprint.w" ((ch1==ASCII_SPACE)||(ch1==ASCII_HORIZONTAL_TAB)) /*:30*/ -#line 571 "qprint.w" +#line 585 "./qprint.w" ){ +if(ch1==EOF){ +break; +} /*39:*/ -#line 730 "qprint.w" +#line 747 "./qprint.w" if(errcheck){ if(/*41:*/ -#line 780 "qprint.w" +#line 797 "./qprint.w" ('a'==0x61) /*:41*/ -#line 732 "qprint.w" +#line 749 "./qprint.w" && Character_is_printable_ISO_8859(ch1)){ @@ -544,7 +547,7 @@ } /*:39*/ -#line 572 "qprint.w" +#line 589 "./qprint.w" ; decode_errors++; ch1= ASCII_SPACE; @@ -552,9 +555,23 @@ } /*:31*/ -#line 531 "qprint.w" +#line 531 "./qprint.w" ; -if(is_end_of_line_sequence(ch1)){ +if(ch1==EOF){ +fprintf(stderr,"Error: unexpected end of file after soft line break sequence at byte %" + +FILE_ADDRESS_FORMAT_LENGTH + +"u (0x%" + +FILE_ADDRESS_FORMAT_LENGTH + +"X) of input.\n", +decode_input_stream_position-1, +decode_input_stream_position-1); +decode_errors++; +} +if(is_end_of_line_sequence(ch1)||(ch1==EOF)){ ch= EOF; }else{ int n1,n2; @@ -564,16 +581,16 @@ n2= hex_to_nybble(ch2); if(n1==EOF||n2==EOF){ /*38:*/ -#line 684 "qprint.w" +#line 701 "./qprint.w" if(errcheck){ if(/*41:*/ -#line 780 "qprint.w" +#line 797 "./qprint.w" ('a'==0x61) /*:41*/ -#line 686 "qprint.w" +#line 703 "./qprint.w" && Character_is_printable_ISO_8859(ch1)&& Character_is_printable_ISO_8859(ch2)){ @@ -609,7 +626,7 @@ } /*:38*/ -#line 541 "qprint.w" +#line 555 "./qprint.w" ; decode_errors++; } @@ -617,7 +634,7 @@ } /*:29*/ -#line 497 "qprint.w" +#line 497 "./qprint.w" ; if(ch!=EOF){ putc(ch,fo); @@ -627,7 +644,7 @@ case ASCII_CARRIAGE_RETURN: case ASCII_LINE_FEED: /*25:*/ -#line 449 "qprint.w" +#line 449 "./qprint.w" { int chn= getc(fi); @@ -644,7 +661,7 @@ } /*:25*/ -#line 505 "qprint.w" +#line 505 "./qprint.w" ; putc('\n',fo); break; @@ -657,7 +674,7 @@ } /*:28*//*35:*/ -#line 635 "qprint.w" +#line 652 "./qprint.w" static int read_decode_character(void) { @@ -671,7 +688,7 @@ } /*:35*//*37:*/ -#line 657 "qprint.w" +#line 674 "./qprint.w" static int hex_to_nybble(int ch) @@ -687,7 +704,7 @@ } /*:37*//*49:*/ -#line 1021 "qprint.w" +#line 1038 "./qprint.w" static void usage(void) @@ -712,7 +729,7 @@ } /*:49*//*51:*/ -#line 1059 "qprint.w" +#line 1076 "./qprint.w" int main(int argc,char*argv[]) @@ -735,7 +752,7 @@ fo= stdout; /*45:*/ -#line 820 "qprint.w" +#line 837 "./qprint.w" for(;;){ @@ -779,7 +796,7 @@ case'E': /*46:*/ -#line 904 "qprint.w" +#line 921 "./qprint.w" switch(optarg[1]){ case'b': @@ -797,7 +814,7 @@ } /*:46*/ -#line 862 "qprint.w" +#line 879 "./qprint.w" ; break; @@ -827,7 +844,7 @@ case'V': /*50:*/ -#line 1047 "qprint.w" +#line 1064 "./qprint.w" printf("%s %s\n",PRODUCT,VERSION); printf("Last revised: %s\n",REVDATE); @@ -835,7 +852,7 @@ printf("at http://www.fourmilab.ch/webtools/qprint/\n";); /*:50*/ -#line 890 "qprint.w" +#line 907 "./qprint.w" ; return 0; @@ -847,10 +864,10 @@ } /*:45*/ -#line 1080 "qprint.w" +#line 1097 "./qprint.w" ; /*47:*/ -#line 925 "qprint.w" +#line 942 "./qprint.w" if(encoding&&decoding){ @@ -864,10 +881,10 @@ } /*:47*/ -#line 1081 "qprint.w" +#line 1098 "./qprint.w" ; /*48:*/ -#line 952 "qprint.w" +#line 969 "./qprint.w" f= 0; for(;optind<argc;optind++){ @@ -935,10 +952,10 @@ } /*:48*/ -#line 1082 "qprint.w" +#line 1099 "./qprint.w" ; /*52:*/ -#line 1106 "qprint.w" +#line 1123 "./qprint.w" #ifdef FORCE_BINARY_IO if(in_std){ @@ -954,7 +971,7 @@ #endif /*:52*/ -#line 1083 "qprint.w" +#line 1100 "./qprint.w" ; if(decoding){ Files old/qprint-1.0/qprint.pdf and new/qprint-1.1/qprint.pdf differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qprint-1.0/qprint.w new/qprint-1.1/qprint.w --- old/qprint-1.0/qprint.w 2001-03-06 00:05:12.000000000 +0100 +++ new/qprint-1.1/qprint.w 2014-12-16 23:12:17.000000000 +0100 @@ -56,7 +56,7 @@ \vskip 30pt -@d REVDATE "5th March 2001" +@d REVDATE "16th December 2014" @** Program global context. Let's start by declaring global definitions and program-wide @@ -529,7 +529,21 @@ @<Decode equal sign escape@>= ch1 = read_decode_character(); @<Ignore white space after soft line break@>; - if (is_end_of_line_sequence(ch1)) { + if (ch1 == EOF) { + fprintf(stderr, "Error: unexpected end of file after soft line break sequence at byte %" + @| + FILE_ADDRESS_FORMAT_LENGTH + @| + "u (0x%" + @| + FILE_ADDRESS_FORMAT_LENGTH + @| + "X) of input.\n", + decode_input_stream_position - 1, + decode_input_stream_position - 1); + decode_errors++; + } + if (is_end_of_line_sequence(ch1) || (ch1 == EOF)) { ch = EOF; } else { int n1, n2; @@ -569,6 +583,9 @@ break; } if (!@<Character is white space@>) { + if (ch1 == EOF) { + break; + } @<Report invalid character after soft line break@>; decode_errors++; ch1 = ASCII_SPACE; /* Fake a space and soldier on */ -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
