Hello community,
here is the log from the commit of package x11-input-fujitsu for openSUSE:Factory
checked in at Fri Jan 14 03:15:04 CET 2011.
--------
--- x11-input-fujitsu/x11-input-fujitsu.changes 2010-04-11 10:09:01.000000000 +0200
+++ x11-input-fujitsu/x11-input-fujitsu.changes 2011-01-13 00:06:26.000000000 +0100
@@ -1,0 +2,7 @@
+Wed Jan 12 23:02:28 UTC 2011 - sndirsch@novell.com
+
+- updated to new upstream version v0.6.7 (bnc #664009)
+ * obsoletes fujitsu-fix-includes.diff, fujitsu-xserver.diff
+ xorg-server-1.6.diff
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
fujitsu-fix-includes.diff
fujitsu-xserver.diff
xf86-input-fujitouch-0.6.5.tar.bz2
xorg-server-1.6.diff
New:
----
xf86-input-fujitouch-0.6.7.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ x11-input-fujitsu.spec ++++++
--- /var/tmp/diff_new_pack.HmkzRR/_old 2011-01-14 03:10:34.000000000 +0100
+++ /var/tmp/diff_new_pack.HmkzRR/_new 2011-01-14 03:10:34.000000000 +0100
@@ -1,7 +1,7 @@
#
-# spec file for package x11-input-fujitsu (Version 0.6.5)
+# spec file for package x11-input-fujitsu
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,17 +21,14 @@
Name: x11-input-fujitsu
BuildRequires: Mesa-devel pkgconfig xorg-x11-proto-devel xorg-x11-server-sdk
Url: http://stz-softwaretechnik.com/~ke/touchscreen/p-series.html
-Version: 0.6.5
-Release: 29
+Version: 0.6.7
+Release: 1
License: GPLv2+ ; Other uncritical OpenSource License
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Group: System/X11/Servers/XF86_4
Summary: X.Org fujitsu Touchscreen Input Driver
ExclusiveArch: %ix86 x86_64
Source: xf86-input-fujitouch-%{version}.tar.bz2
-Patch0: fujitsu-fix-includes.diff
-Patch1: xorg-server-1.6.diff
-Patch2: fujitsu-xserver.diff
%description
This package contains the X.Org fujitsu input drivers for Fujitsu
@@ -45,9 +42,6 @@
%prep
%setup -n xf86-input-fujitouch-%{version} -q
-%patch0 -p0
-%patch1
-%patch2
%build
autoreconf -fi
++++++ xf86-input-fujitouch-0.6.5.tar.bz2 -> xf86-input-fujitouch-0.6.7.tar.bz2 ++++++
++++ 60344 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fujitouch-0.6.5/config.h.in new/xf86-input-fujitouch-0.6.7/config.h.in
--- old/xf86-input-fujitouch-0.6.5/config.h.in 2007-05-10 18:58:59.000000000 +0200
+++ new/xf86-input-fujitouch-0.6.7/config.h.in 2010-09-06 13:48:24.000000000 +0200
@@ -32,6 +32,10 @@
/* Define to 1 if you have the header file. */
#undef HAVE_UNISTD_H
+/* Define to the sub-directory in which libtool stores uninstalled libraries.
+ */
+#undef LT_OBJDIR
+
/* Define to 1 if your C compiler doesn't accept -c and -o together. */
#undef NO_MINUS_C_MINUS_O
@@ -50,6 +54,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fujitouch-0.6.5/configure.ac new/xf86-input-fujitouch-0.6.7/configure.ac
--- old/xf86-input-fujitouch-0.6.5/configure.ac 2007-06-01 09:54:54.000000000 +0200
+++ new/xf86-input-fujitouch-0.6.7/configure.ac 2010-09-06 13:36:57.000000000 +0200
@@ -21,7 +21,7 @@
# Process this file with autoconf to produce a configure script
AC_PREREQ(2.59)
-AC_INIT([xf86-input-fujitouch],[0.6.5],[http://www.conan.de/touchscreen/p-series.html],[xf86-input-fujitouch])
+AC_INIT([xf86-input-fujitouch],0.6.7,[http://www.conan.de/touchscreen/p-series.html],[xf86-input-fujitouch])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_AUX_DIR(.)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fujitouch-0.6.5/fujitsu.c new/xf86-input-fujitouch-0.6.7/fujitsu.c
--- old/xf86-input-fujitouch-0.6.5/fujitsu.c 2007-06-09 17:35:07.000000000 +0200
+++ new/xf86-input-fujitouch-0.6.7/fujitsu.c 2010-09-06 11:12:17.000000000 +0200
@@ -29,56 +29,29 @@
#define _fujitsu_C_
-#include
-#if XF86_VERSION_CURRENT >= XF86_VERSION_NUMERIC(3,9,0,0,0)
-#define XFREE86_V4
-#endif
+#include "xorgVersion.h"
-/*****************************************************************************
- * Standard Headers
- ****************************************************************************/
-#ifdef XFREE86_V4
+
+#ifndef XFree86LOADER
#include
-#else
-#include
-#include
+#include
#endif
-#include
#include
-
#include
#include
#include
-#define NEED_EVENTS
-#include
-#include
-
+#include "misc.h"
#include "xf86.h"
-
-#ifdef XINPUT
-#include
-#include
-#include "extnsionst.h"
-#include "extinit.h"
-#else
-#include "inputstr.h"
-#endif
-
#include "xf86_OSproc.h"
#include "xf86Xinput.h"
#include "exevents.h"
-#include "xf86OSmouse.h"
-#include "randrstr.h"
+#include "xisb.h"
-#ifndef NEED_XF86_TYPES
-#define NEED_XF86_TYPES /* for xisb.h when !XFree86LOADER */
+#ifdef XFree86LOADER
+#include "xf86Module.h"
#endif
-#include "compiler.h"
-
-#include "xisb.h"
-
/*****************************************************************************
* Local Headers
@@ -111,7 +84,7 @@
static InputInfoPtr
FujiPreInit(InputDriverPtr drv, IDevPtr dev, int flags);
-InputDriverRec FUJITSU = {
+_X_EXPORT InputDriverRec FUJITSU = {
1,
"fujitsu",
NULL,
@@ -122,14 +95,6 @@
};
#ifdef XFree86LOADER
-ModuleInfoRec FujiInfo = {
- 1,
- "FUJITSU",
- NULL,
- 0,
- NULL,
-};
-
static XF86ModuleVersionInfo VersionRec =
{
@@ -137,8 +102,8 @@
"Kenan Esau",
MODINFOSTRING1,
MODINFOSTRING2,
- XF86_VERSION_CURRENT,
- 0, 6, 5,
+ XORG_VERSION_CURRENT,
+ 0,6,7,
ABI_CLASS_XINPUT,
ABI_XINPUT_VERSION,
MOD_CLASS_XINPUT,
@@ -153,7 +118,6 @@
int *errmaj,
int *errmin )
{
- xf86AddModuleInfo(&FujiInfo, module);
xf86AddInputDriver(&FUJITSU, module, 0);
return module;
}
@@ -166,7 +130,7 @@
}
-XF86ModuleData fujitsuModuleData = {&VersionRec, Plug, Unplug };
+_X_EXPORT XF86ModuleData fujitsuModuleData = {&VersionRec, Plug, Unplug };
#endif /* XFree86LOADER */
@@ -267,6 +231,10 @@
LocalDevicePtr local = (LocalDevicePtr) dev->public.devicePrivate;
FujiPrivatePtr priv = (FujiPrivatePtr) (local->private);
unsigned char map[] = {0, 1, 2, 3};
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ Atom btn_labels[1] = {0};
+ Atom axis_labels[1] = {0};
+#endif
/*
@@ -305,17 +273,14 @@
priv->screen_height = screenInfo.screens[priv->screen_num]->height;
- if (InitPtrFeedbackClassDeviceStruct((DeviceIntPtr) dev,
- ControlProc) == FALSE)
- {
- ErrorF("Unable to init ptr feedback for Fuji\n");
- return !Success;
- }
-
/*
* Device reports button press for 3 buttons.
*/
- if (InitButtonClassDeviceStruct (dev, 3, map) == FALSE)
+ if (InitButtonClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ btn_labels,
+#endif
+ map) == FALSE)
{
ErrorF("Unable to allocate Fuji touchscreen ButtonClassDeviceStruct\n");
return !Success;
@@ -326,27 +291,54 @@
return !Success;
}
- /*
+ /*
* Device reports motions on 2 axes in absolute coordinates.
* Axes min and max values are reported in raw coordinates.
*/
- if (InitValuatorClassDeviceStruct(dev, 2, xf86GetMotionEvents,
+ if (InitValuatorClassDeviceStruct(dev, 2,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ axis_labels,
+#endif
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+ xf86GetMotionEvents,
+#endif
local->history_size, Absolute) == FALSE)
{
ErrorF ("Unable to allocate Fuji touchscreen ValuatorClassDeviceStruct\n");
return !Success;
}
- else
- {
- InitValuatorAxisStruct(dev, 0, priv->min_x, priv->max_x,
- 1024,
- FUJI_AXIS_MIN_RES /* min_res */ ,
- FUJI_AXIS_MAX_RES /* max_res */ );
- InitValuatorAxisStruct(dev, 1, priv->min_y, priv->max_y,
- 1024,
- FUJI_AXIS_MIN_RES /* min_res */ ,
- FUJI_AXIS_MAX_RES /* max_res */ );
- }
+
+ InitValuatorAxisStruct(dev, 0,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ 0,
+#endif
+0, priv->screen_width,
+ FUJI_AXIS_MAX_RES,
+ FUJI_AXIS_MIN_RES /* min_res */ ,
+ FUJI_AXIS_MAX_RES /* max_res */ );
+
+ /* xf86InitValuatorAxisStruct(dev, 0, 0, priv->screen_width, */
+ /* FUJI_AXIS_MAX_RES, */
+ /* FUJI_AXIS_MIN_RES /\* min_res *\/ , */
+ /* FUJI_AXIS_MAX_RES /\* max_res *\/ ); */
+ /* xf86InitValuatorDefaults(dev, 0); */
+
+ InitValuatorAxisStruct(dev, 1,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) >= 7
+ 0,
+#endif
+ 0, priv->screen_height,
+ FUJI_AXIS_MAX_RES,
+ FUJI_AXIS_MIN_RES /* min_res */ ,
+ FUJI_AXIS_MAX_RES /* max_res */ );
+
+
+ /* xf86InitValuatorAxisStruct(dev, 1, 0, priv->screen_height, */
+ /* FUJI_AXIS_MAX_RES, */
+ /* FUJI_AXIS_MIN_RES /\* min_res *\/ , */
+ /* FUJI_AXIS_MAX_RES /\* max_res *\/ ); */
+ /* xf86InitValuatorDefaults(dev, 1); */
+
if (InitProximityClassDeviceStruct (dev) == FALSE)
{
@@ -354,12 +346,17 @@
return !Success;
}
+ if (InitPtrFeedbackClassDeviceStruct(dev, ControlProc) == FALSE)
+ {
+ ErrorF("Unable to init ptr feedback for Fuji\n");
+ return !Success;
+ }
+
/*
* Allocate the motion events buffer.
*/
xf86MotionHistoryAllocate (local);
-
return (Success);
}
@@ -375,8 +372,7 @@
switch (mode)
{
case DEVICE_INIT:
- DeviceInit(dev);
- RetValue = Success;
+ RetValue = DeviceInit(dev);
break;
case DEVICE_ON:
RetValue = DeviceOn(dev);
@@ -484,16 +480,28 @@
static void FujiHandleCoordinate(LocalDevicePtr local)
{
FujiPrivatePtr priv = (FujiPrivatePtr)local->private;
+ int v0 = 0;
+ int v1 = 0;
DBGOUT( 2, "%s\n", __FUNCTION__);
+
priv->old_x = priv->cur_x;
priv->old_y = priv->cur_y;
- priv->cur_x = ((unsigned short)priv->packet[1]) |
+ v0 = ((unsigned short)priv->packet[1]) |
( ((unsigned short)(priv->packet[2])) << 7 );
- priv->cur_y = ((unsigned short)priv->packet[3]) |
+ v1 = ((unsigned short)priv->packet[3]) |
( ((unsigned short)(priv->packet[4])) << 7 );
+ ConvertProc(local, 0, 2, v0, v1,
+ 0, 0, 0, 0,
+ &priv->cur_x, &priv->cur_y);
+
+ libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y);
+
+ DBGOUT( 2, "setting (x/y)=(%d/%d)\n",
+ priv->cur_x, priv->cur_y);
+
xf86XInputSetScreen(local, priv->screen_num,
priv->cur_x,
priv->cur_y);
@@ -501,12 +509,7 @@
xf86PostProximityEvent(local->dev, 1, 0, 2,
priv->cur_x,
priv->cur_y);
-
-
- libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y);
- DBGOUT( 2, "setting (x/y)=(%d/%d)\n",
- priv->cur_x, priv->cur_y);
-
+
/*
* Send events.
*
@@ -535,6 +538,7 @@
*/
XisbBlockDuration (priv->buffer, -1);
FujiGetPacket(priv);
+
now = GetTimeInMillis();
if (priv->packet_type & PACK_COORDINATE) {
FujiHandleCoordinate(local);
@@ -827,7 +831,7 @@
local->type_name = XI_TOUCHSCREEN;
local->device_control = DeviceControl;
local->read_input = ReadInput;
- local->control_proc = NULL; /* ControlProc; */
+ local->control_proc = NULL;
local->close_proc = CloseProc;
local->switch_mode = SwitchMode;
local->conversion_proc = ConvertProc;
@@ -920,8 +924,6 @@
priv->cur_y = (priv->max_y - priv->min_y) / 2;
libtouchSetPos(priv->libtouch, priv->cur_x, priv->cur_y);
- xf86AlwaysCore(local, TRUE);
-
priv->buffer = XisbNew (local->fd, 200);
priv->packet_type = PACK_UNKNOWN;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fujitouch-0.6.5/fujitsu.h new/xf86-input-fujitouch-0.6.7/fujitsu.h
--- old/xf86-input-fujitouch-0.6.5/fujitsu.h 2007-06-01 09:45:50.000000000 +0200
+++ new/xf86-input-fujitouch-0.6.7/fujitsu.h 2009-07-08 19:38:24.000000000 +0200
@@ -36,11 +36,11 @@
#define FUJI_ROTATE_CCW 2
/* Physical Screen Dimensions. (for default values)
- For the Lifebook B Series currently 800x600 pixels */
-#define FUJI_SCREEN_WIDTH 800
+ For the Lifebook P Series currently 1024x600 pixels */
+#define FUJI_SCREEN_WIDTH 1024
#define FUJI_SCREEN_HEIGHT 600
#define FUJI_AXIS_MIN_RES 0
-#define FUJI_AXIS_MAX_RES 65563
+#define FUJI_AXIS_MAX_RES 10000
#define FUJI_PAN_BORDER 12
#define FUJI_TIMEOUT 500
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fujitouch-0.6.5/libtouch.c new/xf86-input-fujitouch-0.6.7/libtouch.c
--- old/xf86-input-fujitouch-0.6.5/libtouch.c 2007-06-01 10:02:48.000000000 +0200
+++ new/xf86-input-fujitouch-0.6.7/libtouch.c 2009-07-08 16:10:54.000000000 +0200
@@ -23,12 +23,17 @@
*
*/
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include
#include
#include
+#ifndef NEED_XF86_TYPES
#define NEED_XF86_TYPES
-#include
+#endif
#include
#include
#include
@@ -181,7 +186,7 @@
char *str;
- xf86memset(libtouch, 0, sizeof(LibTouchRec));
+ memset(libtouch, 0, sizeof(LibTouchRec));
libtouch->now = GetTimeInMillis();
libtouch->past = libtouch->now;
@@ -210,8 +215,9 @@
/* parse actions for the states */
for (state_action_idx = 0; state_action_str[state_action_idx] != NULL; state_action_idx++) {
+ DBG(4, ErrorF("LibTouch: Finding Option %s\n", state_action_str[state_action_idx]));
str = xf86FindOptionValue(local->options, state_action_str[state_action_idx]);
- if (state_action_str == NULL)
+ if (str == NULL)
continue;
for (action_idx = 0; action_str[action_idx] != NULL; action_idx++) {
@@ -294,6 +300,9 @@
static void
disable_timers(LibTouchRecPtr priv)
{
+ int sigstate;
+
+ sigstate = xf86BlockSIGIO();
if (priv->tap_timer)
TimerFree(priv->tap_timer);
priv->tap_timer = NULL;
@@ -303,6 +312,7 @@
TimerFree(priv->longtouch_timer);
priv->longtouch_timer = NULL;
priv->longtouch_timer_expired = FALSE;
+ xf86UnblockSIGIO(sigstate);
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/xf86-input-fujitouch-0.6.5/missing new/xf86-input-fujitouch-0.6.7/missing
--- old/xf86-input-fujitouch-0.6.5/missing 2007-05-04 14:18:48.000000000 +0200
+++ new/xf86-input-fujitouch-0.6.7/missing 2007-06-09 17:25:57.000000000 +0200
@@ -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 , 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
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org