[Xfce4-commits] r25993 - in squeeze/trunk: . data libsqueeze
Stephan Arts
stephan at xfce.org
Tue Aug 21 00:11:27 CEST 2007
Author: stephan
Date: 2007-08-20 22:11:27 +0000 (Mon, 20 Aug 2007)
New Revision: 25993
Modified:
squeeze/trunk/INSTALL
squeeze/trunk/data/gnu-tar.squeeze
squeeze/trunk/depcomp
squeeze/trunk/install-sh
squeeze/trunk/libsqueeze/Makefile.am
squeeze/trunk/libsqueeze/archive-command.c
squeeze/trunk/libsqueeze/archive-command.h
squeeze/trunk/libsqueeze/archive-iter-pool.c
squeeze/trunk/libsqueeze/archive-iter-pool.h
squeeze/trunk/libsqueeze/archive-iter.c
squeeze/trunk/libsqueeze/archive-iter.h
squeeze/trunk/libsqueeze/archive.c
squeeze/trunk/libsqueeze/archive.h
squeeze/trunk/libsqueeze/internals.h
squeeze/trunk/libsqueeze/libsqueeze-mime.h
squeeze/trunk/libsqueeze/libsqueeze-view.h
squeeze/trunk/libsqueeze/libsqueeze.c
squeeze/trunk/libsqueeze/libsqueeze.h
squeeze/trunk/libsqueeze/macro-command.h
squeeze/trunk/libsqueeze/remove-command.h
squeeze/trunk/libsqueeze/spawn-command.c
squeeze/trunk/libsqueeze/spawn-command.h
squeeze/trunk/libsqueeze/support-factory.c
squeeze/trunk/libsqueeze/support-factory.h
squeeze/trunk/libsqueeze/support-reader.c
squeeze/trunk/libsqueeze/support-reader.h
squeeze/trunk/libsqueeze/support-template.h
squeeze/trunk/libsqueeze/xfce-launch-command.c
squeeze/trunk/libsqueeze/xfce-launch-command.h
squeeze/trunk/missing
Log:
fix segfault
Modified: squeeze/trunk/INSTALL
===================================================================
--- squeeze/trunk/INSTALL 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/INSTALL 2007-08-20 22:11:27 UTC (rev 25993)
@@ -1,8 +1,8 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006 Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
@@ -10,10 +10,7 @@
Basic Installation
==================
-Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -26,9 +23,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
+the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.
+cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -38,17 +35,20 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -78,7 +78,7 @@
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
*Note Defining Variables::, for more details.
@@ -87,15 +87,17 @@
You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
Installation Names
==================
@@ -188,12 +190,12 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
+overridden in the site shell script). Here is a another example:
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
Modified: squeeze/trunk/data/gnu-tar.squeeze
===================================================================
--- squeeze/trunk/data/gnu-tar.squeeze 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/data/gnu-tar.squeeze 2007-08-20 22:11:27 UTC (rev 25993)
@@ -21,7 +21,7 @@
X-Squeeze-Extract=tar -C %d -xf %a %F
X-Squeeze-Refresh=tar -tvvf %a
-[application/x-bzip2-compressed-tar]
+[application/x-bzip-compressed-tar]
X-Squeeze-Requires=tar;bzip2;bunzip2
X-Squeeze-New=tar -jcf %a %F
X-Squeeze-Add=bunzip2 -c %a >> %t;tar -rf %t %F;bzip2 -c %t >> %a
Modified: squeeze/trunk/depcomp
===================================================================
--- squeeze/trunk/depcomp 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/depcomp 2007-08-20 22:11:27 UTC (rev 25993)
@@ -1,10 +1,9 @@
#! /bin/sh
# depcomp - compile a program generating dependencies as side-effects
-scriptversion=2006-10-15.18
+scriptversion=2005-07-09.11
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -92,20 +91,7 @@
## gcc 3 implements dependency tracking that does exactly what
## we want. Yay! Note: for some reason libtool 1.4 doesn't like
## it if -MD -MP comes after the -MF stuff. Hmm.
-## Unfortunately, FreeBSD c89 acceptance of flags depends upon
-## the command line argument order; so add the flags where they
-## appear in depend2.am. Note that the slowdown incurred here
-## affects only configure: in makefiles, %FASTDEP% shortcuts this.
- for arg
- do
- case $arg in
- -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
- *) set fnord "$@" "$arg" ;;
- esac
- shift # fnord
- shift # $arg
- done
- "$@"
+ "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
stat=$?
if test $stat -eq 0; then :
else
@@ -290,46 +276,6 @@
rm -f "$tmpdepfile"
;;
-hp2)
- # The "hp" stanza above does not work with aCC (C++) and HP's ia64
- # compilers, which have integrated preprocessors. The correct option
- # to use with these is +Maked; it writes dependencies to a file named
- # 'foo.d', which lands next to the object file, wherever that
- # happens to be.
- # Much of this is similar to the tru64 case; see comments there.
- dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
- test "x$dir" = "x$object" && dir=
- base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
- if test "$libtool" = yes; then
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir.libs/$base.d
- "$@" -Wc,+Maked
- else
- tmpdepfile1=$dir$base.d
- tmpdepfile2=$dir$base.d
- "$@" +Maked
- fi
- stat=$?
- if test $stat -eq 0; then :
- else
- rm -f "$tmpdepfile1" "$tmpdepfile2"
- exit $stat
- fi
-
- for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
- do
- test -f "$tmpdepfile" && break
- done
- if test -f "$tmpdepfile"; then
- sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
- # Add `dependent.h:' lines.
- sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
- else
- echo "#dummy" > "$depfile"
- fi
- rm -f "$tmpdepfile" "$tmpdepfile2"
- ;;
-
tru64)
# The Tru64 compiler uses -MD to generate dependencies as a side
# effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
@@ -342,13 +288,13 @@
if test "$libtool" = yes; then
# With Tru64 cc, shared objects can also be used to make a
- # static library. This mechanism is used in libtool 1.4 series to
+ # static library. This mecanism is used in libtool 1.4 series to
# handle both shared and static libraries in a single compilation.
# With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
#
# With libtool 1.5 this exception was removed, and libtool now
# generates 2 separate objects for the 2 libraries. These two
- # compilations output dependencies in $dir.libs/$base.o.d and
+ # compilations output dependencies in in $dir.libs/$base.o.d and
# in $dir$base.o.d. We have to check for both files, because
# one of the two compilations can be disabled. We should prefer
# $dir$base.o.d over $dir.libs/$base.o.d because the latter is
Modified: squeeze/trunk/install-sh
===================================================================
--- squeeze/trunk/install-sh 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/install-sh 2007-08-20 22:11:27 UTC (rev 25993)
@@ -1,7 +1,7 @@
#!/bin/sh
# install - install a program, script, or datafile
-scriptversion=2006-10-14.15
+scriptversion=2005-05-14.22
# This originates from X11R5 (mit/util/scripts/install.sh), which was
# later released in X11R6 (xc/config/util/install.sh) with the
@@ -39,24 +39,15 @@
# when there is no Makefile.
#
# This script is compatible with the BSD install script, but was written
-# from scratch.
+# from scratch. It can only install one file at a time, a restriction
+# shared with many OS's install programs.
-nl='
-'
-IFS=" "" $nl"
-
# set DOITPROG to echo to test this script
# Don't use :- since 4.3BSD and earlier shells don't like it.
doit="${DOITPROG-}"
-if test -z "$doit"; then
- doit_exec=exec
-else
- doit_exec=$doit
-fi
-# Put in absolute file names if you don't have them in your path;
-# or use environment vars.
+# put in absolute paths if you don't have them in your path; or use env. vars.
mvprog="${MVPROG-mv}"
cpprog="${CPPROG-cp}"
@@ -67,13 +58,7 @@
rmprog="${RMPROG-rm}"
mkdirprog="${MKDIRPROG-mkdir}"
-posix_glob=
-posix_mkdir=
-
-# Desired mode of installed file.
-mode=0755
-
-chmodcmd=$chmodprog
+chmodcmd="$chmodprog 0755"
chowncmd=
chgrpcmd=
stripcmd=
@@ -110,7 +95,7 @@
CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
"
-while test $# -ne 0; do
+while test -n "$1"; do
case $1 in
-c) shift
continue;;
@@ -126,15 +111,9 @@
--help) echo "$usage"; exit $?;;
- -m) mode=$2
+ -m) chmodcmd="$chmodprog $2"
shift
shift
- case $mode in
- *' '* | *' '* | *'
-'* | *'*'* | *'?'* | *'['*)
- echo "$0: invalid mode: $mode" >&2
- exit 1;;
- esac
continue;;
-o) chowncmd="$chownprog $2"
@@ -157,33 +136,25 @@
--version) echo "$0 $scriptversion"; exit $?;;
- --) shift
+ *) # When -d is used, all remaining arguments are directories to create.
+ # When -t is used, the destination is already specified.
+ test -n "$dir_arg$dstarg" && break
+ # Otherwise, the last argument is the destination. Remove it from $@.
+ for arg
+ do
+ if test -n "$dstarg"; then
+ # $@ is not empty: it contains at least $arg.
+ set fnord "$@" "$dstarg"
+ shift # fnord
+ fi
+ shift # arg
+ dstarg=$arg
+ done
break;;
-
- -*) echo "$0: invalid option: $1" >&2
- exit 1;;
-
- *) break;;
esac
done
-if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
- # When -d is used, all remaining arguments are directories to create.
- # When -t is used, the destination is already specified.
- # Otherwise, the last argument is the destination. Remove it from $@.
- for arg
- do
- if test -n "$dstarg"; then
- # $@ is not empty: it contains at least $arg.
- set fnord "$@" "$dstarg"
- shift # fnord
- fi
- shift # arg
- dstarg=$arg
- done
-fi
-
-if test $# -eq 0; then
+if test -z "$1"; then
if test -z "$dir_arg"; then
echo "$0: no input file specified." >&2
exit 1
@@ -193,33 +164,6 @@
exit 0
fi
-if test -z "$dir_arg"; then
- trap '(exit $?); exit' 1 2 13 15
-
- # Set umask so as not to create temps with too-generous modes.
- # However, 'strip' requires both read and write access to temps.
- case $mode in
- # Optimize common cases.
- *644) cp_umask=133;;
- *755) cp_umask=22;;
-
- *[0-7])
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw='% 200'
- fi
- cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
- *)
- if test -z "$stripcmd"; then
- u_plus_rw=
- else
- u_plus_rw=,u+rw
- fi
- cp_umask=$mode$u_plus_rw;;
- esac
-fi
-
for src
do
# Protect names starting with `-'.
@@ -229,11 +173,15 @@
if test -n "$dir_arg"; then
dst=$src
- dstdir=$dst
- test -d "$dstdir"
- dstdir_status=$?
- else
+ src=
+ if test -d "$dst"; then
+ mkdircmd=:
+ chmodcmd=
+ else
+ mkdircmd=$mkdirprog
+ fi
+ else
# Waiting for this to be detected by the "$cpprog $src $dsttmp" command
# might cause directories to be created, which would be especially bad
# if $src (and thus $dsttmp) contains '*'.
@@ -260,188 +208,53 @@
echo "$0: $dstarg: Is a directory" >&2
exit 1
fi
- dstdir=$dst
- dst=$dstdir/`basename "$src"`
- dstdir_status=0
- else
- # Prefer dirname, but fall back on a substitute if dirname fails.
- dstdir=`
- (dirname "$dst") 2>/dev/null ||
- expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
- X"$dst" : 'X\(//\)[^/]' \| \
- X"$dst" : 'X\(//\)$' \| \
- X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
- echo X"$dst" |
- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
- s//\1/
- q
- }
- /^X\(\/\/\)[^/].*/{
- s//\1/
- q
- }
- /^X\(\/\/\)$/{
- s//\1/
- q
- }
- /^X\(\/\).*/{
- s//\1/
- q
- }
- s/.*/./; q'
- `
-
- test -d "$dstdir"
- dstdir_status=$?
+ dst=$dst/`basename "$src"`
fi
fi
- obsolete_mkdir_used=false
+ # This sed command emulates the dirname command.
+ dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'`
- if test $dstdir_status != 0; then
- case $posix_mkdir in
- '')
- # Create intermediate dirs using mode 755 as modified by the umask.
- # This is like FreeBSD 'install' as of 1997-10-28.
- umask=`umask`
- case $stripcmd.$umask in
- # Optimize common cases.
- *[2367][2367]) mkdir_umask=$umask;;
- .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
+ # Make sure that the destination directory exists.
- *[0-7])
- mkdir_umask=`expr $umask + 22 \
- - $umask % 100 % 40 + $umask % 20 \
- - $umask % 10 % 4 + $umask % 2
- `;;
- *) mkdir_umask=$umask,go-w;;
- esac
+ # Skip lots of stat calls in the usual case.
+ if test ! -d "$dstdir"; then
+ defaultIFS='
+ '
+ IFS="${IFS-$defaultIFS}"
- # With -d, create the new directory with the user-specified mode.
- # Otherwise, rely on $mkdir_umask.
- if test -n "$dir_arg"; then
- mkdir_mode=-m$mode
- else
- mkdir_mode=
- fi
+ oIFS=$IFS
+ # Some sh's can't handle IFS=/ for some reason.
+ IFS='%'
+ set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'`
+ shift
+ IFS=$oIFS
- posix_mkdir=false
- case $umask in
- *[123567][0-7][0-7])
- # POSIX mkdir -p sets u+wx bits regardless of umask, which
- # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
- ;;
- *)
- tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
- trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
+ pathcomp=
- if (umask $mkdir_umask &&
- exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
- then
- if test -z "$dir_arg" || {
- # Check for POSIX incompatibilities with -m.
- # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
- # other-writeable bit of parent directory when it shouldn't.
- # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
- ls_ld_tmpdir=`ls -ld "$tmpdir"`
- case $ls_ld_tmpdir in
- d????-?r-*) different_mode=700;;
- d????-?--*) different_mode=755;;
- *) false;;
- esac &&
- $mkdirprog -m$different_mode -p -- "$tmpdir" && {
- ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
- test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
- }
- }
- then posix_mkdir=:
- fi
- rmdir "$tmpdir/d" "$tmpdir"
- else
- # Remove any dirs left behind by ancient mkdir implementations.
- rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
- fi
- trap '' 0;;
- esac;;
- esac
-
- if
- $posix_mkdir && (
- umask $mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
- )
- then :
- else
-
- # The umask is ridiculous, or mkdir does not conform to POSIX,
- # or it failed possibly due to a race condition. Create the
- # directory the slow way, step by step, checking for races as we go.
-
- case $dstdir in
- /*) prefix=/ ;;
- -*) prefix=./ ;;
- *) prefix= ;;
- esac
-
- case $posix_glob in
- '')
- if (set -f) 2>/dev/null; then
- posix_glob=true
- else
- posix_glob=false
- fi ;;
- esac
-
- oIFS=$IFS
- IFS=/
- $posix_glob && set -f
- set fnord $dstdir
+ while test $# -ne 0 ; do
+ pathcomp=$pathcomp$1
shift
- $posix_glob && set +f
- IFS=$oIFS
-
- prefixes=
-
- for d
- do
- test -z "$d" && continue
-
- prefix=$prefix$d
- if test -d "$prefix"; then
- prefixes=
- else
- if $posix_mkdir; then
- (umask=$mkdir_umask &&
- $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
- # Don't fail if two instances are running concurrently.
- test -d "$prefix" || exit 1
- else
- case $prefix in
- *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
- *) qprefix=$prefix;;
- esac
- prefixes="$prefixes '$qprefix'"
- fi
- fi
- prefix=$prefix/
- done
-
- if test -n "$prefixes"; then
- # Don't fail if two instances are running concurrently.
- (umask $mkdir_umask &&
- eval "\$doit_exec \$mkdirprog $prefixes") ||
- test -d "$dstdir" || exit 1
- obsolete_mkdir_used=true
+ if test ! -d "$pathcomp"; then
+ $mkdirprog "$pathcomp"
+ # mkdir can fail with a `File exist' error in case several
+ # install-sh are creating the directory concurrently. This
+ # is OK.
+ test -d "$pathcomp" || exit
fi
- fi
+ pathcomp=$pathcomp/
+ done
fi
if test -n "$dir_arg"; then
- { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
- { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
- { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
- test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ $doit $mkdircmd "$dst" \
+ && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; }
+
else
+ dstfile=`basename "$dst"`
# Make a couple of temp file names in the proper directory.
dsttmp=$dstdir/_inst.$$_
@@ -449,9 +262,10 @@
# Trap to clean up those temp files at exit.
trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+ trap '(exit $?); exit' 1 2 13 15
# Copy the file name to the temp name.
- (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+ $doit $cpprog "$src" "$dsttmp" &&
# and set any options; do chmod last to preserve setuid bits.
#
@@ -462,10 +276,10 @@
{ test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
&& { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
&& { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
- && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+ && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } &&
# Now rename the file to the real destination.
- { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+ { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \
|| {
# The rename failed, perhaps because mv can't rename something else
# to itself, or perhaps because mv is so ancient that it does not
@@ -477,12 +291,11 @@
# reasons. In this case, the final cleanup might fail but the new
# file should still install successfully.
{
- if test -f "$dst"; then
- $doit $rmcmd -f "$dst" 2>/dev/null \
- || { $doit $mvcmd -f "$dst" "$rmtmp" 2>/dev/null \
- && { $doit $rmcmd -f "$rmtmp" 2>/dev/null; :; }; }\
+ if test -f "$dstdir/$dstfile"; then
+ $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \
+ || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \
|| {
- echo "$0: cannot unlink or rename $dst" >&2
+ echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2
(exit 1); exit 1
}
else
@@ -491,14 +304,17 @@
} &&
# Now rename the file to the real destination.
- $doit $mvcmd "$dsttmp" "$dst"
+ $doit $mvcmd "$dsttmp" "$dstdir/$dstfile"
}
- } || exit 1
-
- trap '' 0
- fi
+ }
+ fi || { (exit 1); exit 1; }
done
+# The final little trick to "correctly" pass the exit status to the exit trap.
+{
+ (exit 0); exit 0
+}
+
# Local variables:
# eval: (add-hook 'write-file-hooks 'time-stamp)
# time-stamp-start: "scriptversion="
Modified: squeeze/trunk/libsqueeze/Makefile.am
===================================================================
--- squeeze/trunk/libsqueeze/Makefile.am 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/Makefile.am 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,6 +19,7 @@
# xfce-launch-command.c xfce-launch-command.h
libsqueeze_1_la_CFLAGS = \
+ -DDATADIR=\"$(datadir)\" \
$(GLIB_CFLAGS) \
$(DBUS_CFLAGS) \
$(THUNAR_VFS_CFLAGS)
Modified: squeeze/trunk/libsqueeze/archive-command.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-command.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive-command.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -196,8 +196,8 @@
LSQArchiveCommand *
lsq_archive_command_new(const gchar *comment,
- LSQArchive *archive,
- LSQCommandFunc exec_command)
+ LSQArchive *archive,
+ LSQCommandFunc exec_command)
{
LSQArchiveCommand *archive_command;
Modified: squeeze/trunk/libsqueeze/archive-command.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-command.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive-command.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -22,14 +22,14 @@
struct _LSQArchiveCommand
{
- GObject parent;
- GQuark domain;
- gchar *comment;
- LSQArchive *archive;
- GError *error;
- gboolean running;
- gboolean safe;
- gpointer user_data;
+ GObject parent;
+ GQuark domain;
+ gchar *comment;
+ LSQArchive *archive;
+ GError *error;
+ gboolean running;
+ gboolean safe;
+ gpointer user_data;
LSQCommandFunc execute;
LSQCommandFunc stop;
};
@@ -48,12 +48,12 @@
LSQArchiveCommand *
lsq_archive_command_new(const gchar *comment,
- LSQArchive *archive,
- LSQCommandFunc exec_command);
+ LSQArchive *archive,
+ LSQCommandFunc exec_command);
LSQArchiveCommand *
lsq_archive_command_new_remove(const gchar *comment,
- LSQArchive *archive,
+ LSQArchive *archive,
GSList *iters);
G_END_DECLS
Modified: squeeze/trunk/libsqueeze/archive-iter-pool.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-iter-pool.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive-iter-pool.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -34,7 +34,7 @@
LSQArchiveIterPool *
lsq_archive_iter_pool_new()
{
- return g_new0(LSQArchiveIterPool, 1);
+ return g_new0(LSQArchiveIterPool, 1);
}
void
@@ -148,7 +148,7 @@
g_free(old_pool);
#ifdef USE_LSQITER_SLICES
/* We need to know if there are still allocations left */
- /* Make all unallocated NULL */
+ /* Make all unallocated NULL */
for(i = ipool->size; i < ipool->reserved; ++i)
{
pool[i] = NULL;
@@ -177,7 +177,7 @@
}
#ifdef USE_LSQITER_SLICES
/* We don't free the pointer so move it */
- /* Place it at the end om the pool */
+ /* Place it at the end om the pool */
pool[ipool->size] = iter;
#endif
}
@@ -186,17 +186,17 @@
gint
lsq_archive_iter_pool_get_size(LSQArchiveIterPool *pool)
{
- return pool->size;
+ return pool->size;
}
gint
lsq_archive_iter_pool_get_reserved(LSQArchiveIterPool *pool)
{
- return pool->reserved;
+ return pool->reserved;
}
LSQArchiveIter *
lsq_archive_iter_pool_get_iter(LSQArchiveIterPool *pool, gint index)
{
- return pool->pool[index];
+ return pool->pool[index];
}
Modified: squeeze/trunk/libsqueeze/archive-iter-pool.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-iter-pool.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive-iter-pool.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,22 +19,22 @@
#define LSQ_TYPE_ARCHIVE lsq_archive_get_type()
-#define LSQ_ARCHIVE(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_ARCHIVE, \
+#define LSQ_ARCHIVE(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_ARCHIVE, \
LSQArchive))
-#define LSQ_IS_ARCHIVE(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_ARCHIVE(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_ARCHIVE))
#define LSQ_ARCHIVE_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_ARCHIVE, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_ARCHIVE, \
LSQArchiveClass))
#define LSQ_IS_ARCHIVE_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_ARCHIVE))
typedef struct _LSQArchiveIter LSQArchiveIter;
@@ -42,11 +42,11 @@
typedef struct _LSQArchiveIterPool LSQArchiveIterPool;
LSQArchiveIterPool *lsq_archive_iter_pool_new();
-void lsq_archive_iter_pool_free(LSQArchiveIterPool *pool);
+void lsq_archive_iter_pool_free(LSQArchiveIterPool *pool);
-gint lsq_archive_iter_pool_get_size(LSQArchiveIterPool *);
-gint lsq_archive_iter_pool_get_reserved(LSQArchiveIterPool *);
-LSQArchiveIter *lsq_archive_iter_pool_get_iter(LSQArchiveIterPool *, gint index);
+gint lsq_archive_iter_pool_get_size(LSQArchiveIterPool *);
+gint lsq_archive_iter_pool_get_reserved(LSQArchiveIterPool *);
+LSQArchiveIter *lsq_archive_iter_pool_get_iter(LSQArchiveIterPool *, gint index);
gboolean
lsq_archive_iter_pool_find_iter(LSQArchiveIterPool *ipool, LSQArchiveEntry *entry, LSQArchiveIter **ret_iter, guint *ret_pos);
Modified: squeeze/trunk/libsqueeze/archive-iter.c
===================================================================
--- squeeze/trunk/libsqueeze/archive-iter.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive-iter.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -123,7 +123,7 @@
#ifdef USE_LSQITER_SLICES
/* Lets see if there is an iter we can use */
if(lsq_archive_iter_pool_get_size(archive->pool) >= lsq_archive_iter_pool_get_reserved(archive->pool) ||
- !(iter = lsq_archive_iter_pool_get_iter(archive->pool, lsq_archive_iter_pool_get_size(archive->pool))))
+ !(iter = lsq_archive_iter_pool_get_iter(archive->pool, lsq_archive_iter_pool_get_size(archive->pool))))
{
/* No iter found, make a new one */
#ifdef USE_GSLICES
Modified: squeeze/trunk/libsqueeze/archive-iter.h
===================================================================
--- squeeze/trunk/libsqueeze/archive-iter.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive-iter.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -27,15 +27,15 @@
guint ref_count;
};
-void lsq_archive_init_iter(LSQArchive *);
-void lsq_archive_free_iter(LSQArchive *);
+void lsq_archive_init_iter(LSQArchive *);
+void lsq_archive_free_iter(LSQArchive *);
-void lsq_archive_iter_remove(LSQArchiveIter *, gboolean);
+void lsq_archive_iter_remove(LSQArchiveIter *, gboolean);
#ifdef DEBUG
LSQArchiveIter *_lsq_archive_iter_ref(LSQArchiveIter *iter, const gchar*, int);
-void _lsq_archive_iter_unref(LSQArchiveIter *iter, const gchar*, int);
+void _lsq_archive_iter_unref(LSQArchiveIter *iter, const gchar*, int);
/*
#define lsq_archive_iter_ref(iter) _lsq_archive_iter_ref(iter, __FILE__, __LINE__)
#define lsq_archive_iter_unref(iter) _lsq_archive_iter_unref(iter, __FILE__, __LINE__)
@@ -43,7 +43,7 @@
#endif
LSQArchiveIter *lsq_archive_iter_ref(LSQArchiveIter *iter);
-void lsq_archive_iter_unref(LSQArchiveIter *iter);
+void lsq_archive_iter_unref(LSQArchiveIter *iter);
G_END_DECLS
Modified: squeeze/trunk/libsqueeze/archive.c
===================================================================
--- squeeze/trunk/libsqueeze/archive.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -287,9 +287,9 @@
lsq_archive_exists(const LSQArchive *archive)
{
if(!archive->priv->file_info)
- archive->priv->file_info = thunar_vfs_info_new_for_path(archive->priv->path_info, NULL);
+ archive->priv->file_info = thunar_vfs_info_new_for_path(archive->priv->path_info, NULL);
- if(archive->priv->file_info)
+ if(archive->priv->file_info)
return TRUE;
return FALSE;
@@ -363,17 +363,17 @@
ThunarVfsPath *
lsq_archive_get_path_info(LSQArchive *archive)
{
- return archive->priv->path_info;
+ return archive->priv->path_info;
}
LSQSupportType
lsq_archive_get_support_mask(const LSQArchive *archive)
{
- return archive->priv->s_template->support_mask;
+ return archive->priv->s_template->support_mask;
}
gboolean
lsq_archive_operate(LSQArchive *archive, LSQCommandType type)
{
- return FALSE;
+ return FALSE;
}
Modified: squeeze/trunk/libsqueeze/archive.h
===================================================================
--- squeeze/trunk/libsqueeze/archive.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/archive.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,22 +19,22 @@
#define LSQ_TYPE_ARCHIVE lsq_archive_get_type()
-#define LSQ_ARCHIVE(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_ARCHIVE, \
+#define LSQ_ARCHIVE(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_ARCHIVE, \
LSQArchive))
-#define LSQ_IS_ARCHIVE(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_ARCHIVE(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_ARCHIVE))
#define LSQ_ARCHIVE_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_ARCHIVE, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_ARCHIVE, \
LSQArchiveClass))
#define LSQ_IS_ARCHIVE_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_ARCHIVE))
enum
@@ -48,8 +48,8 @@
struct _LSQArchivePrivate
{
- ThunarVfsPath *path_info;
- ThunarVfsInfo *file_info;
+ ThunarVfsPath *path_info;
+ ThunarVfsInfo *file_info;
ThunarVfsMimeInfo *mime_info;
LSQSupportTemplate *s_template;
@@ -62,8 +62,8 @@
struct _LSQArchive
{
GObject parent;
- LSQArchivePrivate *priv;
- LSQArchiveEntry *root_entry;
+ LSQArchivePrivate *priv;
+ LSQArchiveEntry *root_entry;
LSQArchiveIterPool *pool;
gchar *temp_dir;
GSList *monitor_list;
@@ -84,24 +84,24 @@
};
-GType lsq_archive_get_type(void);
+GType lsq_archive_get_type(void);
-gchar *lsq_archive_get_path(const LSQArchive *archive);
-const gchar *lsq_archive_get_filename(const LSQArchive *archive);
-const gchar *lsq_archive_get_mimetype(const LSQArchive *archive);
-const gchar *lsq_archive_get_status(const LSQArchive *archive);
-gboolean lsq_archive_exists(const LSQArchive *archive);
+gchar *lsq_archive_get_path(const LSQArchive *archive);
+const gchar *lsq_archive_get_filename(const LSQArchive *archive);
+const gchar *lsq_archive_get_mimetype(const LSQArchive *archive);
+const gchar *lsq_archive_get_status(const LSQArchive *archive);
+gboolean lsq_archive_exists(const LSQArchive *archive);
LSQSupportType lsq_archive_get_support_mask(const LSQArchive *archive);
-LSQArchive *lsq_archive_new(gchar *, const gchar *) G_GNUC_INTERNAL;
-void lsq_archive_state_changed(const LSQArchive *archive) G_GNUC_INTERNAL;
-void lsq_archive_add_children(GSList *files);
-gboolean lsq_archive_remove_file(LSQArchive *, const gchar *);
+LSQArchive *lsq_archive_new(gchar *, const gchar *) G_GNUC_INTERNAL;
+void lsq_archive_state_changed(const LSQArchive *archive) G_GNUC_INTERNAL;
+void lsq_archive_add_children(GSList *files);
+gboolean lsq_archive_remove_file(LSQArchive *, const gchar *);
-ThunarVfsPath *lsq_archive_get_path_info(LSQArchive *);
+ThunarVfsPath *lsq_archive_get_path_info(LSQArchive *);
-gboolean lsq_archive_operate(LSQArchive *archive, LSQCommandType type);
+gboolean lsq_archive_operate(LSQArchive *archive, LSQCommandType type);
Modified: squeeze/trunk/libsqueeze/internals.h
===================================================================
--- squeeze/trunk/libsqueeze/internals.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/internals.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -14,10 +14,10 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
-GSList *support_factory_list;
-GSList *lsq_mime_support_list;
-GSList *lsq_opened_archive_list;
-ThunarVfsPath *lsq_relative_base_path;
+GSList *support_factory_list;
+GSList *lsq_mime_support_list;
+GSList *lsq_opened_archive_list;
+ThunarVfsPath *lsq_relative_base_path;
/*
* gint
Modified: squeeze/trunk/libsqueeze/libsqueeze-mime.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze-mime.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/libsqueeze-mime.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,7 +19,7 @@
typedef struct _LSQMimeSupport LSQMimeSupport;
-const gchar * lsq_mime_support_get_comment(LSQMimeSupport *);
-const gchar * lsq_mime_support_get_name(LSQMimeSupport *);
+const gchar * lsq_mime_support_get_comment(LSQMimeSupport *);
+const gchar * lsq_mime_support_get_name(LSQMimeSupport *);
#endif /* __LIBSQUEEZE_MIME_SUPPORT_H__ */
Modified: squeeze/trunk/libsqueeze/libsqueeze-view.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze-view.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/libsqueeze-view.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -17,35 +17,35 @@
#define __LIBSQUEEZE_VIEW_H__
G_BEGIN_DECLS
-gboolean lsq_archive_iter_is_real(const LSQArchiveIter *);
-LSQArchiveIter * lsq_archive_iter_get_real_parent(LSQArchiveIter *);
+gboolean lsq_archive_iter_is_real(const LSQArchiveIter *);
+LSQArchiveIter * lsq_archive_iter_get_real_parent(LSQArchiveIter *);
-gboolean lsq_archive_iter_is_directory(const LSQArchiveIter *);
-guint lsq_archive_iter_n_children(const LSQArchiveIter *);
-LSQArchiveIter *lsq_archive_iter_nth_child(LSQArchiveIter *, guint);
-LSQArchiveIter *lsq_archive_iter_get_child(LSQArchiveIter *, const gchar *);
-guint lsq_archive_iter_get_depth(const LSQArchiveIter *);
-gboolean lsq_archive_iter_has_parent(const LSQArchiveIter *);
-LSQArchiveIter *lsq_archive_iter_get_parent(LSQArchiveIter *);
+gboolean lsq_archive_iter_is_directory(const LSQArchiveIter *);
+guint lsq_archive_iter_n_children(const LSQArchiveIter *);
+LSQArchiveIter *lsq_archive_iter_nth_child(LSQArchiveIter *, guint);
+LSQArchiveIter *lsq_archive_iter_get_child(LSQArchiveIter *, const gchar *);
+guint lsq_archive_iter_get_depth(const LSQArchiveIter *);
+gboolean lsq_archive_iter_has_parent(const LSQArchiveIter *);
+LSQArchiveIter *lsq_archive_iter_get_parent(LSQArchiveIter *);
-gboolean lsq_archive_iter_get_prop_value(const LSQArchiveIter *iter, guint n, GValue *value);
-const gchar *lsq_archive_iter_get_filename(const LSQArchiveIter *);
-const gchar *lsq_archive_iter_get_mime(const LSQArchiveIter *);
-gchar *lsq_archive_iter_get_path(const LSQArchiveIter *archive);
+gboolean lsq_archive_iter_get_prop_value(const LSQArchiveIter *iter, guint n, GValue *value);
+const gchar *lsq_archive_iter_get_filename(const LSQArchiveIter *);
+const gchar *lsq_archive_iter_get_mime(const LSQArchiveIter *);
+gchar *lsq_archive_iter_get_path(const LSQArchiveIter *archive);
-LSQArchiveIter *lsq_archive_get_iter(LSQArchive *archive, const gchar *path);
+LSQArchiveIter *lsq_archive_get_iter(LSQArchive *archive, const gchar *path);
-GType lsq_archive_get_entry_property_type(const LSQArchive *archive, guint n);
-const gchar *lsq_archive_get_entry_property_name(const LSQArchive *archive, guint n);
-guint lsq_archive_n_entry_properties(const LSQArchive *archive);
+GType lsq_archive_get_entry_property_type(const LSQArchive *archive, guint n);
+const gchar *lsq_archive_get_entry_property_name(const LSQArchive *archive, guint n);
+guint lsq_archive_n_entry_properties(const LSQArchive *archive);
-gboolean lsq_archive_can_stop(const LSQArchive *archive);
-gboolean lsq_archive_stop(const LSQArchive *archive);
+gboolean lsq_archive_can_stop(const LSQArchive *archive);
+gboolean lsq_archive_stop(const LSQArchive *archive);
-const gchar *lsq_archive_get_status(const LSQArchive *archive);
+const gchar *lsq_archive_get_status(const LSQArchive *archive);
-GSList *lsq_iter_slist_copy(GSList *);
-void lsq_iter_slist_free(GSList *);
+GSList *lsq_iter_slist_copy(GSList *);
+void lsq_iter_slist_free(GSList *);
G_END_DECLS
Modified: squeeze/trunk/libsqueeze/libsqueeze.c
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/libsqueeze.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -38,23 +38,17 @@
const gchar *filename = NULL;
gchar *current_dir = g_get_current_dir();
- const gchar *data_home;
- GDir *data_home_dir;
- gchar *data_squeeze;
-
lsq_mime_database = thunar_vfs_mime_database_get_default();
lsq_relative_base_path = thunar_vfs_path_new(current_dir, NULL);
lsq_opened_archive_list = NULL;
g_free(current_dir);
- data_home = g_getenv("XDG_DATA_HOME");
- data_squeeze = g_strconcat(data_home, "/squeeze", NULL);
- data_home_dir = g_dir_open(data_squeeze, 0, NULL);
-
- if(data_home_dir)
+ gchar *data_squeeze = g_strconcat(DATADIR, "/squeeze", NULL);
+ GDir *data_dir = g_dir_open(data_squeeze, 0, NULL);
+ if(data_dir)
{
- while((filename = g_dir_read_name(data_home_dir)) != NULL)
+ while((filename = g_dir_read_name(data_dir)) != NULL)
{
if(g_str_has_suffix(filename, ".squeeze"))
@@ -69,40 +63,8 @@
}
}
- g_dir_close(data_home_dir);
+ g_dir_close(data_dir);
}
-
- g_free(data_squeeze);
-
- const gchar *data_dirs = g_getenv("XDG_DATA_DIRS");
-
- gchar **data_dir = g_strsplit(data_dirs, ":", 0);
- gchar **_data_dir_iter = data_dir;
- while(*_data_dir_iter)
- {
- data_squeeze = g_strconcat(*_data_dir_iter, "/squeeze", NULL);
- data_home_dir = g_dir_open(data_squeeze, 0, NULL);
- if(data_home_dir)
- {
- while((filename = g_dir_read_name(data_home_dir)) != NULL)
- {
-
- if(g_str_has_suffix(filename, ".squeeze"))
- {
- gchar *path = g_strconcat(data_squeeze, "/", filename, NULL);
- LSQSupportFactory *factory = lsq_support_reader_parse_file(path);
- if(factory)
- {
- support_factory_list = g_slist_append(support_factory_list, factory);
- }
- g_free(path);
- }
- }
-
- g_dir_close(data_home_dir);
- }
- _data_dir_iter++;
- }
}
void
@@ -167,11 +129,11 @@
gboolean
lsq_is_supported(const gchar *filename)
{
- return FALSE;
+ return FALSE;
}
GSList *
lsq_get_supported_mime_types(LSQCommandType type)
{
- return NULL;
+ return NULL;
}
Modified: squeeze/trunk/libsqueeze/libsqueeze.h
===================================================================
--- squeeze/trunk/libsqueeze/libsqueeze.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/libsqueeze.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -41,30 +41,30 @@
/*
* gint
* lsq_new_archive(gchar *path,
- * LSQArchiveType type,
- * gboolean overwrite,
- * LSQArchive &&lp_archive)
+ * LSQArchiveType type,
+ * gboolean overwrite,
+ * LSQArchive &&lp_archive)
*
* returns:
* 0 -- success
*/
gint
lsq_new_archive( gchar *path,
- gboolean overwrite,
- gchar *mime,
- LSQArchive **lp_archive);
+ gboolean overwrite,
+ gchar *mime,
+ LSQArchive **lp_archive);
/*
* gint
* lsq_open_archive(gchar *path,
- * LSQArchive **lp_archive)
+ * LSQArchive **lp_archive)
*
* returns:
* 0 -- success
*/
gint
lsq_open_archive( gchar *path,
- LSQArchive **lp_archive);
+ LSQArchive **lp_archive);
/*
* void
Modified: squeeze/trunk/libsqueeze/macro-command.h
===================================================================
--- squeeze/trunk/libsqueeze/macro-command.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/macro-command.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,22 +19,22 @@
#define LSQ_TYPE_MACRO_COMMAND lsq_macro_command_get_type()
-#define LSQ_MACRO_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_MACRO_COMMAND, \
+#define LSQ_MACRO_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_MACRO_COMMAND, \
LSQMacroCommand))
-#define LSQ_IS_MACRO_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_MACRO_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_MACRO_COMMAND))
#define LSQ_MACRO_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_MACRO_COMMAND, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_MACRO_COMMAND, \
LSQMacroCommandClass))
#define LSQ_IS_MACRO_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_MACRO_COMMAND))
typedef struct _LSQMacroCommand LSQMacroCommand;
Modified: squeeze/trunk/libsqueeze/remove-command.h
===================================================================
--- squeeze/trunk/libsqueeze/remove-command.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/remove-command.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,22 +19,22 @@
#define LSQ_TYPE_REMOVE_COMMAND lsq_remove_command_get_type()
-#define LSQ_REMOVE_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_REMOVE_COMMAND, \
+#define LSQ_REMOVE_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_REMOVE_COMMAND, \
LSQRemoveCommand))
-#define LSQ_IS_REMOVE_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_REMOVE_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_REMOVE_COMMAND))
#define LSQ_REMOVE_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_REMOVE_COMMAND, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_REMOVE_COMMAND, \
LSQRemoveCommandClass))
#define LSQ_IS_REMOVE_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_REMOVE_COMMAND))
typedef struct _LSQRemoveCommand LSQRemoveCommand;
Modified: squeeze/trunk/libsqueeze/spawn-command.c
===================================================================
--- squeeze/trunk/libsqueeze/spawn-command.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/spawn-command.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -146,11 +146,11 @@
*/
LSQArchiveCommand *
lsq_spawn_command_new(const gchar *comment,
- LSQArchive *archive,
- const gchar *command,
- const gchar *files,
- const gchar *options,
- const gchar *archive_path)
+ LSQArchive *archive,
+ const gchar *command,
+ const gchar *files,
+ const gchar *options,
+ const gchar *archive_path)
{
LSQArchiveCommand *archive_command;
Modified: squeeze/trunk/libsqueeze/spawn-command.h
===================================================================
--- squeeze/trunk/libsqueeze/spawn-command.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/spawn-command.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,22 +19,22 @@
#define LSQ_TYPE_SPAWN_COMMAND lsq_spawn_command_get_type()
-#define LSQ_SPAWN_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_SPAWN_COMMAND, \
+#define LSQ_SPAWN_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_SPAWN_COMMAND, \
LSQSpawnCommand))
-#define LSQ_IS_SPAWN_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_SPAWN_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_SPAWN_COMMAND))
#define LSQ_SPAWN_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_SPAWN_COMMAND, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_SPAWN_COMMAND, \
LSQSpawnCommandClass))
#define LSQ_IS_SPAWN_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_SPAWN_COMMAND))
@@ -45,18 +45,18 @@
struct _LSQSpawnCommand
{
LSQArchiveCommand parent;
- gchar *command;
- GPid child_pid;
- GIOChannel *ioc_in;
- GIOChannel *ioc_out;
- GIOChannel *ioc_err;
+ gchar *command;
+ GPid child_pid;
+ GIOChannel *ioc_in;
+ GIOChannel *ioc_out;
+ GIOChannel *ioc_err;
- gchar *files;
- gchar *options;
- gchar *archive_path;
+ gchar *files;
+ gchar *options;
+ gchar *archive_path;
- LSQParseFunc parse_stdout;
- LSQParseFunc parse_stderr;
+ LSQParseFunc parse_stdout;
+ LSQParseFunc parse_stderr;
};
typedef struct _LSQSpawnCommandClass LSQSpawnCommandClass;
@@ -71,28 +71,28 @@
LSQArchiveCommand *
lsq_spawn_command_new(const gchar *comment,
- LSQArchive *archive,
- const gchar *command,
- const gchar *files,
- const gchar *options,
- const gchar *archive_path);
+ LSQArchive *archive,
+ const gchar *command,
+ const gchar *files,
+ const gchar *options,
+ const gchar *archive_path);
gboolean
lsq_spawn_command_set_parse_func(LSQSpawnCommand *spawn_command, guint fd, LSQParseFunc func, gpointer user_data);
GIOStatus
lsq_spawn_command_read_line(LSQSpawnCommand *spawn_command,
- guint fd,
- gchar **lines,
- gsize *length,
- GError **error);
+ guint fd,
+ gchar **lines,
+ gsize *length,
+ GError **error);
GIOStatus
lsq_spawn_command_read_bytes(LSQSpawnCommand *spawn_command,
- guint fd,
- gchar *buf,
- gsize max_length,
- gsize *length,
- GError **error);
+ guint fd,
+ gchar *buf,
+ gsize max_length,
+ gsize *length,
+ GError **error);
G_END_DECLS
Modified: squeeze/trunk/libsqueeze/support-factory.c
===================================================================
--- squeeze/trunk/libsqueeze/support-factory.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/support-factory.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -113,7 +113,7 @@
static gint
lsq_lookup_mime_support(gconstpointer a, gconstpointer b)
{
- return 0;
+ return 0;
}
void
Modified: squeeze/trunk/libsqueeze/support-factory.h
===================================================================
--- squeeze/trunk/libsqueeze/support-factory.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/support-factory.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -3,22 +3,22 @@
#define LSQ_TYPE_SUPPORT_FACTORY lsq_support_factory_get_type()
-#define LSQ_SUPPORT_FACTORY(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_SUPPORT_FACTORY, \
+#define LSQ_SUPPORT_FACTORY(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_SUPPORT_FACTORY, \
LSQSupportFactory))
-#define LSQ_IS_SUPPORT_FACTORY(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_SUPPORT_FACTORY(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_SUPPORT_FACTORY))
#define LSQ_SUPPORT_FACTORY_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_CAST ((klass), \
- LSQ_TYPE_SUPPORT_FACTORY, \
+ G_TYPE_CHECK_CLASS_CAST ((klass), \
+ LSQ_TYPE_SUPPORT_FACTORY, \
LSQSupportFactoryClass))
#define LSQ_IS_SUPPORT_FACTORY_CLASS(klass) ( \
- G_TYPE_CHECK_CLASS_TYPE ((klass), \
+ G_TYPE_CHECK_CLASS_TYPE ((klass), \
LSQ_TYPE_SUPPORT_FACTORY))
@@ -26,9 +26,9 @@
struct _LSQSupportFactory
{
- GObject parent;
- gchar *id;
- GSList *mime_support;
+ GObject parent;
+ gchar *id;
+ GSList *mime_support;
};
typedef struct _LSQSupportFactoryClass LSQSupportFactoryClass;
@@ -38,8 +38,8 @@
GObjectClass parent;
};
-GType lsq_support_factory_get_type(void);
-void lsq_support_factory_init_archive(LSQSupportFactory *builder, LSQArchive *archive);
-void lsq_support_factory_add_template(LSQSupportFactory *factory, LSQSupportTemplate *s_template);
+GType lsq_support_factory_get_type(void);
+void lsq_support_factory_init_archive(LSQSupportFactory *builder, LSQArchive *archive);
+void lsq_support_factory_add_template(LSQSupportFactory *factory, LSQSupportTemplate *s_template);
#endif /* __LIBSQUEEZE_SUPPORT_FACTORY_H__ */
Modified: squeeze/trunk/libsqueeze/support-reader.c
===================================================================
--- squeeze/trunk/libsqueeze/support-reader.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/support-reader.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -145,29 +145,41 @@
xfce_rc_set_group(rc, _mime_types[i]);
/* only add to builder->mime_types if all req. apps are found */
s_template->required_apps = xfce_rc_read_list_entry(rc, "X-Squeeze-Requires", ";");
- gchar **_iter = s_template->required_apps;
- s_template->supported = TRUE;
- while(*_iter)
+ if (s_template->required_apps)
{
- gchar *path = g_find_program_in_path(*_iter);
- if(path)
- g_free(path);
- else
+ gchar **_iter = s_template->required_apps;
+ s_template->supported = TRUE;
+ while(*_iter)
{
- s_template->supported = FALSE;
- break;
+ gchar *path = g_find_program_in_path(*_iter);
+ if(path)
+ {
+ g_free(path);
+ }
+ else
+ {
+ s_template->supported = FALSE;
+ break;
+ }
+ _iter++;
}
- _iter++;
}
+ else
+ s_template->supported = FALSE;
s_template->mime_info = thunar_vfs_mime_database_get_info(lsq_mime_database, _mime_types[i]);
s_template->id = (const gchar *)factory->id;
- s_template->new_cmd_queue = xfce_rc_read_list_entry(rc, "X-Squeeze-New", ";");
- s_template->add_cmd_queue = xfce_rc_read_list_entry(rc, "X-Squeeze-Add", ";");
+ s_template->new_cmd_queue = xfce_rc_read_list_entry(rc, "X-Squeeze-New", ";");
+ s_template->add_cmd_queue = xfce_rc_read_list_entry(rc, "X-Squeeze-Add", ";");
s_template->remove_cmd_queue = xfce_rc_read_list_entry(rc, "X-Squeeze-Remove", ";");
s_template->extract_cmd_queue = xfce_rc_read_list_entry(rc, "X-Squeeze-Extract", ";");
s_template->refresh_cmd_queue = xfce_rc_read_list_entry(rc, "X-Squeeze-Refresh", ";");
+
+ if (s_template->supported)
+ g_debug("%s supported\n", _mime_types[i]);
+ else
+ g_debug("%s not supported\n", _mime_types[i]);
lsq_support_factory_add_template(factory, s_template);
}
Modified: squeeze/trunk/libsqueeze/support-reader.h
===================================================================
--- squeeze/trunk/libsqueeze/support-reader.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/support-reader.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -20,29 +20,29 @@
#define LSQ_TYPE_SUPPORT_READER lsq_support_reader_get_type()
-#define LSQ_SUPPORT_READER(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_SUPPORT_READER, \
+#define LSQ_SUPPORT_READER(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_SUPPORT_READER, \
LSQSupportReader))
-#define LSQ_IS_SUPPORT_READER(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_SUPPORT_READER(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_SUPPORT_READER))
#define LSQ_SUPPORT_READER_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_SUPPORT_READER, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_SUPPORT_READER, \
LSQSupportReaderClass))
#define LSQ_IS_SUPPORT_READER_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_SUPPORT_READER))
typedef struct _LSQSupportReader LSQSupportReader;
struct _LSQSupportReader
{
- GObject parent;
+ GObject parent;
};
typedef struct _LSQSupportReaderClass LSQSupportReaderClass;
@@ -52,7 +52,7 @@
GObjectClass parent;
};
-GType lsq_support_reader_get_type(void);
+GType lsq_support_reader_get_type(void);
LSQSupportReader *lsq_support_reader_new();
LSQSupportFactory *lsq_support_reader_parse_file(const gchar *filename);
Modified: squeeze/trunk/libsqueeze/support-template.h
===================================================================
--- squeeze/trunk/libsqueeze/support-template.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/support-template.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,9 +19,9 @@
typedef enum
{
- LSQ_SUPPORT_FILES = 1 << 0x0,
+ LSQ_SUPPORT_FILES = 1 << 0x0,
LSQ_SUPPORT_FOLDERS = 1 << 0x1,
- LSQ_SUPPORT_MANY = 1 << 0x2
+ LSQ_SUPPORT_MANY = 1 << 0x2
} LSQSupportType;
typedef enum
Modified: squeeze/trunk/libsqueeze/xfce-launch-command.c
===================================================================
--- squeeze/trunk/libsqueeze/xfce-launch-command.c 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/xfce-launch-command.c 2007-08-20 22:11:27 UTC (rev 25993)
@@ -132,14 +132,14 @@
archive_command = g_object_new(lsq_xfce_launch_command_get_type(), NULL);
- LSQXfceLaunchCommand *xfce_launch_command = LSQ_XFCE_LAUNCH_COMMAND(archive_command);
+ LSQXfceLaunchCommand *xfce_launch_command = LSQ_XFCE_LAUNCH_COMMAND(archive_command);
xfce_launch_command->connection = dbus_g_bus_get (DBUS_BUS_SESSION, &error);
xfce_launch_command->proxy = dbus_g_proxy_new_for_name(xfce_launch_command->connection,
- "org.xfce.FileManager",
- "/org/xfce/FileManager",
- "org.xfce.FileManager");
+ "org.xfce.FileManager",
+ "/org/xfce/FileManager",
+ "org.xfce.FileManager");
g_object_ref(G_OBJECT(archive));
archive_command->archive = archive;
Modified: squeeze/trunk/libsqueeze/xfce-launch-command.h
===================================================================
--- squeeze/trunk/libsqueeze/xfce-launch-command.h 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/libsqueeze/xfce-launch-command.h 2007-08-20 22:11:27 UTC (rev 25993)
@@ -19,22 +19,22 @@
#define LSQ_TYPE_XFCE_LAUNCH_COMMAND lsq_xfce_launch_command_get_type()
-#define LSQ_XFCE_LAUNCH_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_CAST ((obj), \
- LSQ_TYPE_XFCE_LAUNCH_COMMAND, \
+#define LSQ_XFCE_LAUNCH_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_CAST ((obj), \
+ LSQ_TYPE_XFCE_LAUNCH_COMMAND, \
LSQXfceLaunchCommand))
-#define LSQ_IS_XFCE_LAUNCH_COMMAND(obj) ( \
- G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
+#define LSQ_IS_XFCE_LAUNCH_COMMAND(obj) ( \
+ G_TYPE_CHECK_INSTANCE_TYPE ((obj), \
LSQ_TYPE_XFCE_LAUNCH_COMMAND))
#define LSQ_XFCE_LAUNCH_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_CAST ((class), \
- LSQ_TYPE_XFCE_LAUNCH_COMMAND, \
+ G_TYPE_CHECK_CLASS_CAST ((class), \
+ LSQ_TYPE_XFCE_LAUNCH_COMMAND, \
LSQXfceLaunchCommandClass))
#define LSQ_IS_XFCE_LAUNCH_COMMAND_CLASS(class) ( \
- G_TYPE_CHECK_CLASS_TYPE ((class), \
+ G_TYPE_CHECK_CLASS_TYPE ((class), \
LSQ_TYPE_XFCE_LAUNCH_COMMAND))
typedef struct _LSQXfceLaunchCommand LSQXfceLaunchCommand;
@@ -43,7 +43,7 @@
{
LSQArchiveCommand parent;
DBusGConnection *connection;
- DBusGProxy *proxy;
+ DBusGProxy *proxy;
gchar *files;
};
@@ -54,9 +54,9 @@
LSQArchiveCommandClass parent;
};
-GType lsq_xfce_launch_command_get_type();
+GType lsq_xfce_launch_command_get_type();
LSQArchiveCommand *lsq_xfce_launch_command_new(const gchar *comment, LSQArchive *archive, const gchar *, GSList *files);
-void lsq_xfce_launch_command_set_args(LSQXfceLaunchCommand *command);
+void lsq_xfce_launch_command_set_args(LSQXfceLaunchCommand *command);
G_END_DECLS
#endif /* __LIBSQUEEZE_XFCE_LAUNCH_COMMAND_H__ */
Modified: squeeze/trunk/missing
===================================================================
--- squeeze/trunk/missing 2007-08-20 17:01:55 UTC (rev 25992)
+++ squeeze/trunk/missing 2007-08-20 22:11:27 UTC (rev 25993)
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
More information about the Xfce4-commits
mailing list