diff --git a/gnome/gcmd.c b/gnome/gcmd.c index acdcc936d..d9072b9b3 100644 --- a/gnome/gcmd.c +++ b/gnome/gcmd.c @@ -63,19 +63,25 @@ void gnome_open_terminal_with_cmd (const char *command) { char *p; - - if (!(p = gnome_is_program_in_path ("gnome-terminal"))) + int quote_all = 0; + + if (!(p = gnome_is_program_in_path ("gnome-terminal"))){ if (!(p = gnome_is_program_in_path ("dtterm"))) if (!(p = gnome_is_program_in_path ("nxterm"))) if (!(p = gnome_is_program_in_path ("color-xterm"))) if (!(p = gnome_is_program_in_path ("rxvt"))) p = gnome_is_program_in_path ("xterm"); + } else + quote_all = 1; if (p){ if (command){ char *q; - - q = g_strconcat (p, " -e ", command, NULL); + + if (quote_all) + q = g_strconcat (p, " -e '", command, "'", NULL); + else + q = g_strconcat (p, " -e ", command, NULL); my_system (EXECUTE_AS_SHELL, shell, q); g_free (q); } else diff --git a/mcfn_install.in b/mcfn_install.in index 9aed40805..f6f359330 100644 --- a/mcfn_install.in +++ b/mcfn_install.in @@ -1,4 +1,4 @@ -#/bin/sh +#!/bin/sh # prefix=@prefix@ if test -n `echo $prefix | grep prefix`; then diff --git a/po/mc.pot b/po/mc.pot index d5332ec58..01a44a2d0 100644 --- a/po/mc.pot +++ b/po/mc.pot @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 1999-03-08 22:28-0600\n" +"POT-Creation-Date: 1999-03-09 12:45-0600\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -39,129 +39,129 @@ msgstr "" msgid " There is no other panel to compare contents to " msgstr "" -#: gnome/gcmd.c:106 +#: gnome/gcmd.c:112 msgid "GNU Midnight Commander" msgstr "" -#: gnome/gcmd.c:109 +#: gnome/gcmd.c:115 msgid "The GNOME edition of the Midnight Commander file manager." msgstr "" -#: gnome/gcmd.c:121 src/main.c:844 src/screen.c:2047 +#: gnome/gcmd.c:127 src/main.c:844 src/screen.c:2047 msgid " The Midnight Commander " msgstr "" -#: gnome/gcmd.c:122 src/main.c:845 +#: gnome/gcmd.c:128 src/main.c:845 msgid " Do you really want to quit the Midnight Commander? " msgstr "" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 -#: src/file.c:2195 src/filegui.c:573 src/hotlist.c:1035 src/main.c:846 +#: gnome/gcmd.c:129 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 +#: src/file.c:2193 src/filegui.c:573 src/hotlist.c:1035 src/main.c:846 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&Yes" msgstr "" -#: gnome/gcmd.c:123 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 -#: src/file.c:2195 src/filegui.c:572 src/hotlist.c:1035 src/main.c:846 +#: gnome/gcmd.c:129 gtkedit/editcmd.c:2246 src/cmd.c:251 src/file.c:1813 +#: src/file.c:2193 src/filegui.c:572 src/hotlist.c:1035 src/main.c:846 #: src/screen.c:2049 src/subshell.c:701 src/subshell.c:727 src/tree.c:755 #: src/view.c:404 msgid "&No" msgstr "" -#: gnome/gcmd.c:220 +#: gnome/gcmd.c:226 msgid "Sort By" msgstr "" #. we define this up here so we can pass it in to our callback -#: gnome/gcmd.c:225 +#: gnome/gcmd.c:231 msgid "Ignore case sensitivity." msgstr "" -#: gnome/gcmd.c:233 src/chmod.c:150 src/screen.c:425 +#: gnome/gcmd.c:239 src/chmod.c:150 src/screen.c:425 msgid "Name" msgstr "" -#: gnome/gcmd.c:240 +#: gnome/gcmd.c:246 msgid "File Type" msgstr "" -#: gnome/gcmd.c:246 src/screen.c:426 src/screen.c:427 +#: gnome/gcmd.c:252 src/screen.c:426 src/screen.c:427 msgid "Size" msgstr "" -#: gnome/gcmd.c:252 +#: gnome/gcmd.c:258 msgid "Time Last Accessed" msgstr "" -#: gnome/gcmd.c:258 +#: gnome/gcmd.c:264 msgid "Time Last Modified" msgstr "" -#: gnome/gcmd.c:264 +#: gnome/gcmd.c:270 msgid "Time Last Changed" msgstr "" -#: gnome/gcmd.c:278 +#: gnome/gcmd.c:284 msgid "Reverse the order." msgstr "" -#: gnome/gcmd.c:340 +#: gnome/gcmd.c:346 msgid "Enter name." msgstr "" -#: gnome/gcmd.c:346 +#: gnome/gcmd.c:352 msgid "Enter label for command:" msgstr "" -#: gnome/gcmd.c:441 +#: gnome/gcmd.c:447 msgid "Find all core files" msgstr "" -#: gnome/gcmd.c:444 src/panelize.c:350 +#: gnome/gcmd.c:450 src/panelize.c:350 msgid "Find rejects after patching" msgstr "" -#: gnome/gcmd.c:486 +#: gnome/gcmd.c:492 msgid "Run Command" msgstr "" #. Frame 1 -#: gnome/gcmd.c:491 +#: gnome/gcmd.c:497 msgid "Preset Commands" msgstr "" -#: gnome/gcmd.c:508 +#: gnome/gcmd.c:514 msgid "Add" msgstr "" -#: gnome/gcmd.c:512 +#: gnome/gcmd.c:518 msgid "Remove" msgstr "" #. Frame 2 -#: gnome/gcmd.c:520 +#: gnome/gcmd.c:526 msgid "Run this Command" msgstr "" -#: gnome/gcmd.c:527 +#: gnome/gcmd.c:533 msgid "Command: " msgstr "" -#: gnome/gcmd.c:588 +#: gnome/gcmd.c:594 msgid "Set Filter" msgstr "" -#: gnome/gcmd.c:593 gnome/gcmd.c:634 gnome/gcmd.c:639 gnome/gcmd.c:643 +#: gnome/gcmd.c:599 gnome/gcmd.c:640 gnome/gcmd.c:645 gnome/gcmd.c:649 #: gnome/gscreen.c:2600 msgid "Show all files" msgstr "" -#: gnome/gcmd.c:600 +#: gnome/gcmd.c:606 msgid "." msgstr "" -#: gnome/gcmd.c:616 +#: gnome/gcmd.c:622 msgid "" "Enter a filter here for files in the panel view.\n" "\n" @@ -169,15 +169,15 @@ msgid "" "*.gif will show just gif images" msgstr "" -#: gnome/gcmd.c:618 +#: gnome/gcmd.c:624 msgid "Enter a Regular Expression to filter files in the panel view." msgstr "" -#: gnome/gcmd.c:675 gnome/gpopup.c:53 +#: gnome/gcmd.c:681 gnome/gpopup.c:53 msgid " Open with..." msgstr "" -#: gnome/gcmd.c:676 gnome/gpopup.c:54 +#: gnome/gcmd.c:682 gnome/gpopup.c:54 msgid "Enter extra arguments:" msgstr "" @@ -350,7 +350,7 @@ msgid "" "Directory not empty. Delete it recursively?" msgstr "" -#: gnome/gdialogs.c:729 src/file.c:2190 +#: gnome/gdialogs.c:729 src/file.c:2188 msgid " Delete: " msgstr "" @@ -1116,11 +1116,11 @@ msgstr "" msgid "help" msgstr "" -#: gnome/gwidget.c:96 src/file.c:2214 +#: gnome/gwidget.c:96 src/file.c:2212 msgid "yes" msgstr "" -#: gnome/gwidget.c:98 src/file.c:2212 +#: gnome/gwidget.c:98 src/file.c:2210 msgid "no" msgstr "" @@ -2142,7 +2142,7 @@ msgstr "" msgid "Background process:" msgstr "" -#: src/background.c:284 src/file.c:2135 +#: src/background.c:284 src/file.c:2133 msgid " Background process error " msgstr "" @@ -3192,68 +3192,68 @@ msgstr "" msgid " Sorry, I could not put the job in background " msgstr "" -#: src/file.c:1946 src/file.c:2051 +#: src/file.c:1947 src/file.c:2049 msgid " Internal failure " msgstr "" -#: src/file.c:1946 src/file.c:2051 +#: src/file.c:1947 src/file.c:2049 msgid " Unknown file operation " msgstr "" -#: src/file.c:1965 +#: src/file.c:1966 #, c-format msgid "" " Destination \"%s\" must be a directory \n" " %s " msgstr "" -#: src/file.c:2136 src/filegui.c:263 +#: src/file.c:2134 src/filegui.c:263 msgid "&Skip" msgstr "" -#: src/file.c:2136 +#: src/file.c:2134 msgid "&Retry" msgstr "" -#: src/file.c:2136 src/file.c:2197 src/filegui.c:260 src/filegui.c:562 +#: src/file.c:2134 src/file.c:2195 src/filegui.c:260 src/filegui.c:562 msgid "&Abort" msgstr "" -#: src/file.c:2188 +#: src/file.c:2186 msgid "" "\n" " Directory not empty. \n" " Delete it recursively? " msgstr "" -#: src/file.c:2189 +#: src/file.c:2187 msgid "" "\n" " Background process: Directory not empty \n" " Delete it recursively? " msgstr "" -#: src/file.c:2196 +#: src/file.c:2194 msgid "a&ll" msgstr "" -#: src/file.c:2196 src/filegui.c:565 +#: src/file.c:2194 src/filegui.c:565 msgid "non&E" msgstr "" -#: src/file.c:2206 +#: src/file.c:2204 msgid " Type 'yes' if you REALLY want to delete " msgstr "" -#: src/file.c:2208 +#: src/file.c:2206 msgid "all the directories " msgstr "" -#: src/file.c:2210 +#: src/file.c:2208 msgid " Recursive Delete " msgstr "" -#: src/file.c:2211 +#: src/file.c:2209 msgid " Background process: Recursive Delete " msgstr "" @@ -4965,7 +4965,7 @@ msgstr "" msgid "NumLock on keypad" msgstr "" -#: src/wtools.c:587 vfs/vfs.c:1760 +#: src/wtools.c:587 vfs/vfs.c:1762 msgid "Password:" msgstr "" diff --git a/slang/sltermin.c b/slang/sltermin.c index d8144e90f..44ee8ccda 100644 --- a/slang/sltermin.c +++ b/slang/sltermin.c @@ -235,7 +235,7 @@ char *SLtt_tigetent (char *term) char *tidir; int i; FILE *fp = NULL; - char file[256]; + char *file; Terminfo_Type *ti; if ( @@ -269,8 +269,14 @@ char *SLtt_tigetent (char *term) tidir = Terminfo_Dirs[i]; if (tidir != NULL) { - g_snprintf (file, sizeof (file), "%s/%c/%s", tidir, *term, term); - if (NULL != (fp = open_terminfo (file, ti))) break; + file = SLMALLOC (strlen (tidir) + 3 + strlen (term) + 1); + if (!file) + continue; + sprintf (file, "%s/%c/%s", tidir, *term, term); + fp = open_terminfo (file, ti); + SLFREE (file); + if (fp) + break; } i++; } diff --git a/src/subshell.c b/src/subshell.c index 0dcb67919..16fa1c9f4 100644 --- a/src/subshell.c +++ b/src/subshell.c @@ -454,7 +454,12 @@ void init_subshell (void) break; case ZSH: - execl (shell, "zsh", "+Z", NULL); + /* change from "+Z" to "-Z" by Michael Bramer + * (Debian-mc-maintainer) from a patch from + * Radovan Garabik + */ + execl (shell, "zsh", "-Z", NULL); + break; } diff --git a/vfs/extfs/deb.in b/vfs/extfs/deb.in index 69f6c69be..f370b1a3b 100644 --- a/vfs/extfs/deb.in +++ b/vfs/extfs/deb.in @@ -8,6 +8,11 @@ # Modified by Fernando Alegre 1997 # (to handle both new and old tar formats) # +# Modified by Patrik Rak 1998 +# (add by Michael Bramer Debian-mc-maintainer ) +# (to allow access to package control files) +# +# # # Copyright (C) 1997 Free Software Foundation # @@ -24,6 +29,8 @@ sub mcdebfs_list $install_size=length($pressinstall); print "dr-xr-xr-x 1 root root 0 $date CONTENTS\n"; + # from Patrik Rak + print "dr-xr-xr-x 1 root root 0 $date DEBIAN\n"; print "-r--r--r-- 1 root root $info_size $date INFO\n"; print "-r-xr--r-- 1 root root $install_size $date INSTALL\n"; @@ -71,6 +78,30 @@ sub mcdebfs_list print "$perm 1 $owgr $size $month $day $year $time CONTENTS/$path$arrow$link\n"; } } + # begin from Patrik Rak + if ( open(PIPEIN, "dpkg-deb -I $archivename |") ) + { + while() + { + split; + $size=$_[0]; + last if $size =~ /:/; + next if $size !~ /\d+/; + if($_[4] eq '*') + { + $perm='-r-xr-xr-x'; + $name=$_[5]; + } + else + { + $perm='-r--r--r--'; + $name=$_[4]; + } + print "$perm 1 root root $size $date DEBIAN/$name\n"; + } + } + # end from Patrik Rak + } sub mcdebfs_copyout @@ -80,6 +111,14 @@ sub mcdebfs_copyout if($filename eq "INFO") { system("dpkg-deb -I $archive > $destfile"); + # begin from Patrik Rak + } + elsif($filename =~ /^DEBIAN/) + { + $filename=~s!^DEBIAN/!!; + system("dpkg-deb -I $archive $filename > $destfile"); + # end from Patrik Rak + } elsif($filename eq "INSTALL") {