Attachment 158017 Details for Bug 245934 – suggested patch

[patch] suggested patch

nroff.patch (text/plain), 1.86 KB, created by Miroslav Lichvar on 2007-06-27 14:24:29 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Miroslav Lichvar

Created: 2007-06-27 14:24:29 UTC

Size: 1.86 KB

patch

obsolete

>--- nroff.orig	2007-06-27 16:06:46.000000000 +0200
>+++ nroff	2007-06-27 16:08:56.000000000 +0200
>@@ -4,7 +4,7 @@
> prog="$0"
> charset_in=iso-8859-1
> charset_out=`locale charmap 2>/dev/null`
>-opts=
>+opts="-mtty-char -Tutf8"
> 
> for i
> do
>@@ -44,15 +44,21 @@
>   shift
> done
> 
>-TMPFILE=$(mktemp /tmp/man.XXXXXX)
>-trap "rm -f $TMPFILE" 0 1 2 3 15
>-
>-cat ${1+"$@"} >| ${TMPFILE}
>+if TMPFILE=$(mktemp /tmp/man.XXXXXX 2>/dev/null); then
>+  trap "rm -f $TMPFILE" 0 1 2 3 15
>+  cat ${1+"$@"} >| $TMPFILE
>+else
>+  buf=$(cat ${1+"$@"})
>+  TMPFILE=buf
>+fi
> 
>-if iconv -f utf-8 -t utf-8 -o /dev/null ${TMPFILE} 2>/dev/null
>-then
>-  charset_in=utf-8  
>+if [ $TMPFILE = buf ]; then
>+  echo -n "$buf" | iconv -f utf-8 -t utf-8 &>/dev/null && charset_in=utf-8
> else
>+  iconv -f utf-8 -t utf-8 $TMPFILE &>/dev/null && charset_in=utf-8
>+fi
>+
>+if [ $charset_in != utf-8 ]; then
>   echo XXX
>   echo XXX $"WARNING: old character encoding and/or character set"
>   echo XXX
>@@ -64,10 +70,26 @@
> # This shell script is intended for use with man, so warnings are
> # probably not wanted.  Also load nroff-style character definitions.
> 
>-/usr/bin/iconv -f ${charset_in} -t utf-8 ${TMPFILE} | \
>-    /usr/bin/groff -mtty-char -Tutf8 $opts 2>/dev/null | \
>+if [ $charset_in = utf-8 -a $charset_out = UTF-8 ]; then
>+  if [ $TMPFILE = buf ]; then
>+    echo -n "$buf" | /usr/bin/groff $opts 2>/dev/null
>+  else
>+    exec < $TMPFILE
>+    rm -f $TMPFILE
>+    exec /usr/bin/groff $opts 2>/dev/null
>+  fi
>+else
>+  if [ $TMPFILE = buf ]; then
>+    echo -n "$buf" | \
>+      /usr/bin/iconv -f $charset_in -t utf-8 | \
>+      /usr/bin/groff $opts 2>/dev/null | \
>+      /usr/bin/iconv -f utf-8 -t ${charset_out}//translit
>+  else
>+    /usr/bin/iconv -f $charset_in -t utf-8 $TMPFILE | \
>+    /usr/bin/groff $opts 2>/dev/null | \
>     /usr/bin/iconv -f utf-8 -t ${charset_out}//translit
>-
>-rm -f ${TMPFILE}
>+    rm -f $TMPFILE
>+  fi
>+fi
> 
> # eof

Actions: View | Diff

Attachments on bug 245934: 158017