commit a2ps

Hello community, here is the log from the commit of package a2ps checked in at Tue Jul 15 21:14:13 CEST 2008. -------- --- a2ps/a2ps.changes 2008-03-04 15:32:27.000000000 +0100 +++ a2ps/a2ps.changes 2008-07-15 17:23:28.170296000 +0200 @@ -1,0 +2,5 @@ +Tue Jul 15 17:23:07 CEST 2008 - werner@suse.de + +- Better workaround for UTF-8 files + +------------------------------------------------------------------- Old: ---- a2ps.sh New: ---- a2ps-4.13-utf8.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ a2ps.spec ++++++ --- /var/tmp/diff_new_pack.X24451/_old 2008-07-15 21:13:07.000000000 +0200 +++ /var/tmp/diff_new_pack.X24451/_new 2008-07-15 21:13:07.000000000 +0200 @@ -20,11 +20,10 @@ AutoReqProv: on PreReq: %{install_info_prereq} Version: 4.13 -Release: 1241 +Release: 1285 Summary: Converts ASCII Text into PostScript Source: a2ps-4.13b.tar.bz2 Source1: a2ps-ko.po -Source2: a2ps.sh Patch: a2ps-4.13.dif Patch1: a2ps-4.13-security.patch Patch2: a2ps-4.13-ogonkify.patch @@ -34,6 +33,7 @@ Patch6: a2ps-4.13-include.patch Patch7: a2ps-4.13-acroread.patch Patch8: a2ps-4.13-base.patch +Patch9: a2ps-4.13-utf8.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -59,6 +59,7 @@ %patch -P 7 -p 0 -b .acroread %endif %patch -P 8 -p 0 -b .base +%patch -P 9 -p 0 -b .utf8 %patch cp -f %SOURCE1 po/ko.po rename no nb po/no.* @@ -96,8 +97,6 @@ make install DESTDIR=$RPM_BUILD_ROOT PSFONT_PATH=/usr/share/ghostscript/fonts rm -r $RPM_BUILD_ROOT/%{_infodir}/regex* rm -r $RPM_BUILD_ROOT/%{_infodir}/dir - mv $RPM_BUILD_ROOT/usr/bin/a2ps $RPM_BUILD_ROOT/usr/bin/a2ps.bin - install -m 0755 %{SOURCE2} $RPM_BUILD_ROOT/usr/bin/a2ps %{find_lang} %{name} %clean @@ -117,7 +116,6 @@ %config /etc/a2ps-site.cfg %config /etc/a2ps.cfg /usr/bin/a2ps -/usr/bin/a2ps.bin /usr/bin/card /usr/bin/composeglyphs /usr/bin/fixnt @@ -138,6 +136,8 @@ /usr/share/ogonkify %changelog +* Tue Jul 15 2008 werner@suse.de +- Better workaround for UTF-8 files * Tue Mar 04 2008 werner@suse.de - Work around reencoded fonts from ogonkify in wdiff screen mode * Fri Apr 20 2007 aj@suse.de @@ -253,7 +253,7 @@ - merged patches * Thu Jul 06 2000 werner@suse.de - Add `,' to atan2 in for77kwds.ssh to distinguish atan2 from cabs. -* Fri Apr 07 2000 bk@suse.de +* Sat Apr 08 2000 bk@suse.de - added suse update config macro * Fri Feb 25 2000 kukuk@suse.de - Fill out copyright and group tag ++++++ a2ps-4.13.dif ++++++ ++++ 1065 lines (skipped) ++++ between a2ps/a2ps-4.13.dif ++++ and a2ps/a2ps-4.13.dif ++++++ a2ps-4.13-utf8.patch ++++++ --- etc/a2ps_cfg.in +++ etc/a2ps_cfg.in 2008-07-15 14:12:03.044199079 +0200 @@ -266,6 +266,9 @@ $3p<-$3p> $4l# lines\n|| # rm is done by a2ps itself. No need to quote. # +########## UTF-8 filter for patched a2ps only +Delegation: utf8 utf8:plain iconv -c -f UTF-8 -t $x + ########## Compressed files # A compressed file should be decompressed and processed by a2ps # A consequence is that the decompressed file may be delegated. --- sheets/sheets.map +++ sheets/sheets.map 2008-07-15 17:24:53.922318567 +0200 @@ -144,6 +144,9 @@ gmake: /GNUmakefile/ /*\/GNUmakefile/ plain: /*.doc/ /*.txt/ +# UTF-8 type for patched a2ps only +utf8: + # Ada files ada: /*.ad[abs]/ --- src/buffer.c +++ src/buffer.c 2008-07-15 17:11:53.197276387 +0200 @@ -193,9 +193,24 @@ buffer_release (buffer_t * buffer) { /* VALUE is malloc'd only if BUFFER->LOWER_CASE */ if (buffer->lower_case) - free (buffer->value); + { + free (buffer->value); + buffer->value = NULL; + buffer->allocsize = 0; + } /* I don't know how this one should be used */ - /* obstack_free (&buffer->obstack, NULL); */ + if (buffer->buf) + { + free(buffer->buf); + buffer->buf = NULL; + buffer->bufsize = 0; + buffer->bufoffset = 0; + } + if (buffer->len == 0) + { + buffer->content = obstack_finish(&buffer->obstack); + } + obstack_free (&buffer->obstack, NULL); } void --- src/generate.c +++ src/generate.c 2008-07-15 17:12:02.778172717 +0200 @@ -35,7 +35,7 @@ char *sample_tmpname = NULL; */ enum style_kind_e { - no_style, binary, sshparser, unprintable, delegate + no_style, binary, sshparser, unprintable, delegate, utf8 }; static enum style_kind_e @@ -49,6 +49,8 @@ string_to_style_kind (const char * strin return no_style; else if (strequ (string, "delegate")) return delegate; + else if (strequ (string, "utf8")) + return utf8; return sshparser; } /************************************************************************/ @@ -360,6 +362,76 @@ print (uchar * filename, int * native_jo msg_file_pages_printed (job, _("plain")); (*native_jobs)++; break; + + case utf8: + { + char * argv[21], * ptr; + int n, argc, pfd[2]; + pid_t pid; + + if ((contract = get_subcontract(file_job->type, "plain")) == (struct delegation*)0) + goto plain_print; + + argc = 1; + argv[0] = ptr = contract->command; + while ((ptr = (strchr(ptr, ' ')))) + { + *ptr++ = '\0'; + if (argc < 20) + argv[argc++] = ptr; + } + + for (n = 0; n < argc; n++) + if (strstr(argv[n], "$x")) + argv[n] = job->requested_encoding_name; + argv[argc] = (char*)0; + + if (pipe(pfd) < 0) + { + message (msg_report2, (stderr, _("[%s (%s): failed. Ignored]\n"), file_job->name, buf)); + break; + } + + switch ((pid = fork())) + { + case -1: + close(pfd[0]); + close(pfd[1]); + goto err; + break; + case 0: + if ((n = fileno(input_buffer->stream)) == 0) + { + char * tmpfile = NULL; + FILE * tmp; + tempname_ensure(tmpfile); + buffer_save(input_buffer, tmpfile); + tmp = xrfopen(tmpfile); + n = fileno(tmp); + free(tmpfile); + } + close(0); + if (dup(n) < 0) + goto err; + close(1); + if (dup(pfd[1]) < 0) + goto err; + close(n); + close(pfd[0]); + close(pfd[1]); + execvp(argv[0], argv); + err: + message (msg_report2, (stderr, _("[%s (%s): failed. Ignored]\n"), file_job->name, buf)); + break; + default: + close(pfd[1]); + input_buffer->bufoffset = input_buffer->bufsize; + input_buffer->stream = fdopen(pfd[0], "r"); + input_buffer->pipe_p = true; + goto plain_print; + } + break; + } } input_end (input_buffer); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org