Reimport of sysutils/mc for people preferring the old 4.6 branch.

15 files changed, 451 insertions, 0 deletions

diff --git a/sysutils/mc46/DESCR b/sysutils/mc46/DESCR
new file mode 100644
index 00000000000..51b5905b5f6
--- /dev/null
+++ b/sysutils/mc46/DESCR
@@ -0,0 +1,6 @@
+GNU Midnight Commander is a user-friendly yet powerful file manager
+and visual shell, useful to novice and guru alike. It provides a
+clear, user-friendly, and somewhat protected interface to a Unix
+system while making many frequent file operations more efficient and
+preserving the full power of the command prompt. You will wonder how
+you could ever live without it.
diff --git a/sysutils/mc46/Makefile b/sysutils/mc46/Makefile
new file mode 100644
index 00000000000..1802d84d394
--- /dev/null
+++ b/sysutils/mc46/Makefile
@@ -0,0 +1,56 @@
+# $NetBSD: Makefile,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+DISTNAME=	mc-4.6.1
+PKGREVISION=	7
+CATEGORIES=	sysutils
+MASTER_SITES=	http://www.ibiblio.org/pub/Linux/utils/file/managers/mc/ \
+		${MASTER_SITE_SUNSITE:=utils/file/managers/mc/}
+
+MAINTAINER=	pavel.arnost@clnet.cz
+HOMEPAGE=	http://www.ibiblio.org/mc/
+COMMENT=	User-friendly file manager and visual shell
+
+PKG_DESTDIR_SUPPORT=	user-destdir
+PKG_INSTALLATION_TYPES=	overwrite pkgviews
+
+USE_TOOLS+=		pkg-config unzip:run zip:run
+GNU_CONFIGURE=		YES
+USE_PKGLOCALEDIR=	YES
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "Linux"
+PLIST_SRC+=		${PKGDIR}/PLIST.cons.saver
+.endif
+
+# we need working e2fsprogs and gpm packages first
+CONFIGURE_ARGS+=	--without-ext2undel
+CONFIGURE_ARGS+=	--without-gpm-mouse
+CONFIGURE_ARGS+=	UNZIP=${TOOLS_PATH.unzip} ZIP=${TOOLS_PATH.zip}
+
+PLIST_SRC+=		${PKGDIR}/PLIST
+.include "options.mk"
+
+PKG_SYSCONFSUBDIR=	mc
+SUBST_CLASSES+=		conf
+SUBST_STAGE.conf=	post-patch
+SUBST_FILES.conf=	vfs/extfs.c vfs/sfs.c
+SUBST_VARS.conf=	PKG_SYSCONFDIR
+
+.if !empty(PKG_OPTIONS:Mvfs)
+EGDIR=			${PREFIX}/share/examples/mc
+CONF_FILES+=		${EGDIR}/extfs.ini ${PKG_SYSCONFDIR}/extfs.ini
+CONF_FILES+=		${EGDIR}/sfs.ini ${PKG_SYSCONFDIR}/sfs.ini
+.endif
+
+post-install:
+# remove dir if no extensions were installed there
+	rmdir ${DESTDIR}${PREFIX:Q}/lib/mc 2>/dev/null || ${TRUE}
+.if !empty(PKG_OPTIONS:Mvfs)
+	${INSTALL_DATA_DIR} ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/vfs/extfs/extfs.ini ${DESTDIR}${EGDIR}
+	${INSTALL_DATA} ${WRKSRC}/vfs/extfs/sfs.ini ${DESTDIR}${EGDIR}
+.endif
+
+.include "../../devel/gettext-lib/buildlink3.mk"
+.include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/mc46/PLIST b/sysutils/mc46/PLIST
new file mode 100644
index 00000000000..086ae224d6d
--- /dev/null
+++ b/sysutils/mc46/PLIST
@@ -0,0 +1,78 @@
+@comment $NetBSD: PLIST,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+bin/mc
+bin/mcmfmt
+bin/mcview
+man/es/man1/mc.1
+man/hu/man1/mc.1
+man/it/man1/mc.1
+man/man1/mc.1
+man/man1/mcedit.1
+man/man1/mcview.1
+man/pl/man1/mc.1
+man/ru/man1/mc.1
+man/sr/man1/mc.1
+share/locale/az/LC_MESSAGES/mc.mo
+share/locale/be/LC_MESSAGES/mc.mo
+share/locale/bg/LC_MESSAGES/mc.mo
+share/locale/ca/LC_MESSAGES/mc.mo
+share/locale/cs/LC_MESSAGES/mc.mo
+share/locale/da/LC_MESSAGES/mc.mo
+share/locale/de/LC_MESSAGES/mc.mo
+share/locale/el/LC_MESSAGES/mc.mo
+share/locale/es/LC_MESSAGES/mc.mo
+share/locale/eu/LC_MESSAGES/mc.mo
+share/locale/fi/LC_MESSAGES/mc.mo
+share/locale/fr/LC_MESSAGES/mc.mo
+share/locale/hu/LC_MESSAGES/mc.mo
+share/locale/it/LC_MESSAGES/mc.mo
+share/locale/ja/LC_MESSAGES/mc.mo
+share/locale/ko/LC_MESSAGES/mc.mo
+share/locale/lt/LC_MESSAGES/mc.mo
+share/locale/lv/LC_MESSAGES/mc.mo
+share/locale/mn/LC_MESSAGES/mc.mo
+share/locale/nl/LC_MESSAGES/mc.mo
+share/locale/no/LC_MESSAGES/mc.mo
+share/locale/pl/LC_MESSAGES/mc.mo
+share/locale/pt/LC_MESSAGES/mc.mo
+share/locale/pt_BR/LC_MESSAGES/mc.mo
+share/locale/ro/LC_MESSAGES/mc.mo
+share/locale/ru/LC_MESSAGES/mc.mo
+share/locale/sk/LC_MESSAGES/mc.mo
+share/locale/sl/LC_MESSAGES/mc.mo
+share/locale/sr/LC_MESSAGES/mc.mo
+share/locale/sv/LC_MESSAGES/mc.mo
+share/locale/ta/LC_MESSAGES/mc.mo
+share/locale/tr/LC_MESSAGES/mc.mo
+share/locale/uk/LC_MESSAGES/mc.mo
+share/locale/wa/LC_MESSAGES/mc.mo
+share/locale/zh_CN/LC_MESSAGES/mc.mo
+share/locale/zh_TW/LC_MESSAGES/mc.mo
+share/mc/bin/mc-wrapper.csh
+share/mc/bin/mc-wrapper.sh
+share/mc/bin/mc.csh
+share/mc/bin/mc.sh
+share/mc/cedit.menu
+share/mc/edit.indent.rc
+share/mc/edit.spell.rc
+share/mc/mc.ext
+share/mc/mc.hint
+share/mc/mc.hint.cs
+share/mc/mc.hint.es
+share/mc/mc.hint.hu
+share/mc/mc.hint.it
+share/mc/mc.hint.nl
+share/mc/mc.hint.pl
+share/mc/mc.hint.ru
+share/mc/mc.hint.sr
+share/mc/mc.hint.uk
+share/mc/mc.hint.zh
+share/mc/mc.hlp
+share/mc/mc.hlp.es
+share/mc/mc.hlp.hu
+share/mc/mc.hlp.it
+share/mc/mc.hlp.pl
+share/mc/mc.hlp.ru
+share/mc/mc.hlp.sr
+share/mc/mc.lib
+share/mc/mc.menu
+share/mc/mc.menu.sr
diff --git a/sysutils/mc46/PLIST.charset b/sysutils/mc46/PLIST.charset
new file mode 100644
index 00000000000..c619285f752
--- /dev/null
+++ b/sysutils/mc46/PLIST.charset
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.charset,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+share/mc/mc.charsets
diff --git a/sysutils/mc46/PLIST.cons.saver b/sysutils/mc46/PLIST.cons.saver
new file mode 100644
index 00000000000..0f6f6fb2198
--- /dev/null
+++ b/sysutils/mc46/PLIST.cons.saver
@@ -0,0 +1,2 @@
+@comment $NetBSD: PLIST.cons.saver,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+lib/mc/cons.saver
diff --git a/sysutils/mc46/PLIST.mcedit b/sysutils/mc46/PLIST.mcedit
new file mode 100644
index 00000000000..3d5680b2e89
--- /dev/null
+++ b/sysutils/mc46/PLIST.mcedit
@@ -0,0 +1,45 @@
+@comment $NetBSD: PLIST.mcedit,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+bin/mcedit
+share/mc/syntax/Syntax
+share/mc/syntax/ada95.syntax
+share/mc/syntax/aspx.syntax
+share/mc/syntax/assembler.syntax
+share/mc/syntax/c.syntax
+share/mc/syntax/changelog.syntax
+share/mc/syntax/cs.syntax
+share/mc/syntax/diff.syntax
+share/mc/syntax/dos.syntax
+share/mc/syntax/eiffel.syntax
+share/mc/syntax/fortran.syntax
+share/mc/syntax/html.syntax
+share/mc/syntax/idl.syntax
+share/mc/syntax/java.syntax
+share/mc/syntax/js.syntax
+share/mc/syntax/latex.syntax
+share/mc/syntax/lisp.syntax
+share/mc/syntax/lsm.syntax
+share/mc/syntax/lua.syntax
+share/mc/syntax/m4.syntax
+share/mc/syntax/mail.syntax
+share/mc/syntax/makefile.syntax
+share/mc/syntax/ml.syntax
+share/mc/syntax/nroff.syntax
+share/mc/syntax/octave.syntax
+share/mc/syntax/pascal.syntax
+share/mc/syntax/perl.syntax
+share/mc/syntax/php.syntax
+share/mc/syntax/po.syntax
+share/mc/syntax/povray.syntax
+share/mc/syntax/python.syntax
+share/mc/syntax/ruby.syntax
+share/mc/syntax/sh.syntax
+share/mc/syntax/slang.syntax
+share/mc/syntax/smalltalk.syntax
+share/mc/syntax/spec.syntax
+share/mc/syntax/sql.syntax
+share/mc/syntax/swig.syntax
+share/mc/syntax/syntax.syntax
+share/mc/syntax/tcl.syntax
+share/mc/syntax/texinfo.syntax
+share/mc/syntax/unknown.syntax
+share/mc/syntax/xml.syntax
diff --git a/sysutils/mc46/PLIST.vfs b/sysutils/mc46/PLIST.vfs
new file mode 100644
index 00000000000..82a8cc9846d
--- /dev/null
+++ b/sysutils/mc46/PLIST.vfs
@@ -0,0 +1,27 @@
+@comment $NetBSD: PLIST.vfs,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+share/examples/mc/extfs.ini
+share/examples/mc/sfs.ini
+share/mc/extfs/README
+share/mc/extfs/a
+share/mc/extfs/apt
+share/mc/extfs/audio
+share/mc/extfs/bpp
+share/mc/extfs/deb
+share/mc/extfs/deba
+share/mc/extfs/debd
+share/mc/extfs/dpkg
+share/mc/extfs/hp48
+share/mc/extfs/iso9660
+share/mc/extfs/lslR
+share/mc/extfs/mailfs
+share/mc/extfs/patchfs
+share/mc/extfs/rpm
+share/mc/extfs/rpms
+share/mc/extfs/trpm
+share/mc/extfs/uar
+share/mc/extfs/uarj
+share/mc/extfs/uha
+share/mc/extfs/ulha
+share/mc/extfs/urar
+share/mc/extfs/uzip
+share/mc/extfs/uzoo
diff --git a/sysutils/mc46/distinfo b/sysutils/mc46/distinfo
new file mode 100644
index 00000000000..82dd04a5c13
--- /dev/null
+++ b/sysutils/mc46/distinfo
@@ -0,0 +1,11 @@
+$NetBSD: distinfo,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+SHA1 (mc-4.6.1.tar.gz) = 92be0802143245e0fb7e3847d70da614cad7d5fb
+RMD160 (mc-4.6.1.tar.gz) = d565ee95a8916d73fad5e0defeb9f2f57e50962b
+Size (mc-4.6.1.tar.gz) = 3928370 bytes
+SHA1 (patch-aa) = 7168617908acb8aead0109308845513316ff3f18
+SHA1 (patch-ab) = 11677a3029ee2669d8a74a47188cff728052f408
+SHA1 (patch-ac) = 9d35fbfb73a3c5b9bc7dff604599d63069fc62ab
+SHA1 (patch-ad) = 78e0c111ca92f55701a0963b049b1dfef9f06cf1
+SHA1 (patch-ae) = d7e097b4b07b7d31475ae7424686365534f20a17
+SHA1 (patch-su) = adad37f777fd2db905108fbd8d1b1a139cf1352a
diff --git a/sysutils/mc46/options.mk b/sysutils/mc46/options.mk
new file mode 100644
index 00000000000..6122bade1b8
--- /dev/null
+++ b/sysutils/mc46/options.mk
@@ -0,0 +1,93 @@
+# $NetBSD: options.mk,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+#
+
+PKG_OPTIONS_VAR=	PKG_OPTIONS.mc
+PKG_OPTIONS_REQUIRED_GROUPS=	screen
+PKG_OPTIONS_GROUP.screen=	ncurses slang
+PKG_SUPPORTED_OPTIONS=	glib12 mc-charset mc-edit mc-samba mc-subshell mc-vfs x11
+PKG_SUGGESTED_OPTIONS=	mc-charset mc-edit mc-subshell mc-vfs slang
+
+# remove after pkgsrc-2010Q1
+PKG_OPTIONS_LEGACY_OPTS=	charset:mc-charset
+PKG_OPTIONS_LEGACY_OPTS+=	edit:mc-edit
+PKG_OPTIONS_LEGACY_OPTS+=	samba:mc-samba
+PKG_OPTIONS_LEGACY_OPTS+=	subshell:mc-subshell
+PKG_OPTIONS_LEGACY_OPTS+=	vfs:mc-vfs
+
+.include "../../mk/bsd.options.mk"
+
+### The charset option enables input/display support for various 8-bit
+### codepages, chooseable at runtime.
+.if !empty(PKG_OPTIONS:Mmc-charset)
+CONFIGURE_ARGS+=	--enable-charset
+PLIST_SRC+=		${PKGDIR}/PLIST.charset
+.include "../../converters/libiconv/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--disable-charset
+.endif
+
+### The internal editor can be disabled to save disk space.
+.if !empty(PKG_OPTIONS:Mmc-edit)
+CONFIGURE_ARGS+=	--with-edit
+PLIST_SRC+=		${PKGDIR}/PLIST.mcedit
+.else
+CONFIGURE_ARGS+=	--without-edit
+.endif
+
+### On some systems where glib-2.0 does not build, glib-1.2 can be used
+### instead.
+.if !empty(PKG_OPTIONS:Mglib12)
+CONFIGURE_ARGS+=	--with-glib12
+.include "../../devel/glib/buildlink3.mk"
+.else
+.include "../../devel/glib2/buildlink3.mk"
+.endif
+
+### Enable the Samba virtual file system. You can connect to Windows
+### file servers or Samba servers in your network.
+.if !empty(PKG_OPTIONS:Mmc-samba)
+CONFIGURE_ARGS+=	--with-samba
+.else
+CONFIGURE_ARGS+=	--without-samba
+.endif
+
+### The subshell is a shell command line inside the Midnight Commander.
+.if !empty(PKG_OPTIONS:Mmc-subshell)
+CONFIGURE_ARGS+=	--with-subshell
+.else
+CONFIGURE_ARGS+=	--without-subshell
+.endif
+
+### Enable the virtual file system of the Midnight Commander. With the
+### VFS you can access files via FTP, SSH, in various archive formats
+### like if they were on your local disk.
+.if !empty(PKG_OPTIONS:Mmc-vfs)
+CONFIGURE_ARGS+=	--with-vfs
+PLIST_SRC+=		${PKGDIR}/PLIST.vfs
+USE_TOOLS+=		perl:run
+.else
+CONFIGURE_ARGS+=	--without-vfs
+.endif
+
+### X11 support allows better key handling (detection of the Alt, Ctrl,
+### Shift modifiers) and mouse support.
+.if !empty(PKG_OPTIONS:Mx11)
+CONFIGURE_ARGS+=		--with-x
+.include "../../x11/libXt/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=		--without-x
+.endif
+
+### The Midnight Commander can use three different screen libraries to
+### draw itself on the screen. SLang, ncurses, and a slim variant of
+### SLang (the default), which is distributed with the Midnight Commander.
+.if !empty(PKG_OPTIONS:Mslang)
+CONFIGURE_ARGS+=	--with-screen=slang
+.include "../../devel/libslang2/buildlink3.mk"
+.elif !empty(PKG_OPTIONS:Mncurses)
+USE_NCURSES=		yes
+CONFIGURE_ARGS+=	--with-screen=ncurses
+.include "../../devel/ncurses/buildlink3.mk"
+.else
+CONFIGURE_ARGS+=	--with-screen=mcslang
+.endif
diff --git a/sysutils/mc46/patches/patch-aa b/sysutils/mc46/patches/patch-aa
new file mode 100644
index 00000000000..5b2088e6937
--- /dev/null
+++ b/sysutils/mc46/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+--- vfs/extfs.c.orig	2008-02-14 12:26:28.000000000 +0100
++++ vfs/extfs.c
+@@ -1278,7 +1278,7 @@ static int extfs_init (struct vfs_class 
+     char *mc_extfsini;
+     char key[256];
+ 
+-    mc_extfsini = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR "extfs.ini");
++    mc_extfsini = concat_dir_and_file ("@PKG_SYSCONFDIR@", "extfs.ini");
+     cfg = fopen (mc_extfsini, "r");
+ 
+     /* We may not use vfs_die() message or message or similar,
diff --git a/sysutils/mc46/patches/patch-ab b/sysutils/mc46/patches/patch-ab
new file mode 100644
index 00000000000..635faca6682
--- /dev/null
+++ b/sysutils/mc46/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+--- vfs/sfs.c.orig	2008-02-14 12:27:01.000000000 +0100
++++ vfs/sfs.c
+@@ -314,7 +314,7 @@ static int sfs_init (struct vfs_class *m
+     FILE *cfg;
+     char key[256];
+ 
+-    mc_sfsini = concat_dir_and_file (mc_home, "extfs" PATH_SEP_STR "sfs.ini");
++    mc_sfsini = concat_dir_and_file ("@PKG_SYSCONFDIR@", "sfs.ini");
+     cfg = fopen (mc_sfsini, "r");
+ 
+     if (!cfg){
diff --git a/sysutils/mc46/patches/patch-ac b/sysutils/mc46/patches/patch-ac
new file mode 100644
index 00000000000..ee4031e42a4
--- /dev/null
+++ b/sysutils/mc46/patches/patch-ac
@@ -0,0 +1,13 @@
+$NetBSD: patch-ac,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+--- vfs/extfs/Makefile.in.orig	2008-02-14 12:56:12.000000000 +0100
++++ vfs/extfs/Makefile.in
+@@ -226,7 +226,7 @@ target_alias = @target_alias@
+ extfsdir = $(pkgdatadir)/extfs
+ 
+ # Files to install and distribute other than extfs scripts
+-EXTFS_MISC = README extfs.ini sfs.ini
++EXTFS_MISC = README
+ 
+ # Scripts hat don't need adaptation to the local system
+ EXTFS_CONST = bpp rpm trpm
diff --git a/sysutils/mc46/patches/patch-ad b/sysutils/mc46/patches/patch-ad
new file mode 100644
index 00000000000..2428f1c3be5
--- /dev/null
+++ b/sysutils/mc46/patches/patch-ad
@@ -0,0 +1,62 @@
+$NetBSD: patch-ad,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+--- src/find.c.orig	2005-05-27 14:19:18.000000000 +0000
++++ src/find.c
+@@ -606,18 +606,7 @@ do_search (struct Dlg_head *h)
+ 		    stop_idle (h);
+ 		    return 0;
+ 		}
+-		if (find_ignore_dirs){
+-                    int found;
+-		    char *temp_dir = g_strconcat (":", tmp, ":", (char *) NULL);
+-
+-                    found = strstr (find_ignore_dirs, temp_dir) != 0;
+-                    g_free (temp_dir);
+-		    if (found)
+-			g_free (tmp);
+-		    else
+-			break;
+-		} else
+-		    break;
++		break;
+ 	    } 
+ 
+ 	    g_free (directory);
+@@ -652,14 +641,30 @@ do_search (struct Dlg_head *h)
+ 	return 1;
+     }
+ 
+-    if (subdirs_left && directory) { /* Can directory be NULL ? */
+-	char *tmp_name = concat_dir_and_file (directory, dp->d_name);
+-	if (!mc_lstat (tmp_name, &tmp_stat)
+-	    && S_ISDIR (tmp_stat.st_mode)) {
+-	    push_directory (tmp_name);
+-	    subdirs_left--;
++    if (directory) { /* Can directory be NULL ? */
++	char *tmp_name;
++	if (find_ignore_dirs){
++	    int found;
++
++    	    tmp_name = g_strconcat (":", dp->d_name, ":", (char *) NULL);
++
++            found = strstr (find_ignore_dirs, tmp_name) != 0;
++            g_free (tmp_name);
++	    if (found) {
++		dp = mc_readdir (dirp);
++		return 1;
++	    }
++	}
++
++	if (subdirs_left) {
++	    tmp_name = concat_dir_and_file (directory, dp->d_name);
++	    if (!mc_lstat (tmp_name, &tmp_stat)
++		&& S_ISDIR (tmp_stat.st_mode)) {
++		push_directory (tmp_name);
++		subdirs_left--;
++	    }
++	    g_free (tmp_name);
+ 	}
+-	g_free (tmp_name);
+     }
+ 
+     if (regexp_match (find_pattern, dp->d_name, match_file)){
diff --git a/sysutils/mc46/patches/patch-ae b/sysutils/mc46/patches/patch-ae
new file mode 100644
index 00000000000..3270119818f
--- /dev/null
+++ b/sysutils/mc46/patches/patch-ae
@@ -0,0 +1,12 @@
+$NetBSD: patch-ae,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+--- src/slint.c.orig	2005-05-27 14:19:18.000000000 +0000
++++ src/slint.c
+@@ -179,6 +179,7 @@ slang_init (void)
+ {
+     struct sigaction act, oact;
+     
++    SLutf8_enable (-1);
+     SLtt_get_terminfo ();
+ 
+    /*
diff --git a/sysutils/mc46/patches/patch-su b/sysutils/mc46/patches/patch-su
new file mode 100644
index 00000000000..9276296e8f7
--- /dev/null
+++ b/sysutils/mc46/patches/patch-su
@@ -0,0 +1,18 @@
+$NetBSD: patch-su,v 1.1.1.1 2011/01/23 14:31:56 wiz Exp $
+
+Old bash versions required octal characters with 3 digits, newer
+versions (>= 2.05) require 4 digits.
+
+--- src/subshell.c.orig	2007-08-14 14:25:55.000000000 +0200
++++ src/subshell.c	2007-08-14 14:37:39.000000000 +0200
+@@ -728,8 +728,8 @@ subshell_name_quote (const char *s)
+ 	    if (isalpha ((unsigned char) *s)) {
+ 		*d++ = (unsigned char) *s;
+ 	    } else {
+-		sprintf (d, "\\%03o", (unsigned char) *s);
+-		d += 4;
++		sprintf (d, "\\%04o", (unsigned char) *s);
++		d += 5;
+ 	    }
+ 	}
+     } else {