Hello community, here is the log from the commit of package awesfx for openSUSE:Factory checked in at Thu Mar 31 11:24:00 CEST 2011.
-------- --- awesfx/awesfx.changes 2009-05-29 12:51:40.000000000 +0200 +++ /mounts/work_src_done/STABLE/awesfx/awesfx.changes 2011-03-29 08:41:02.000000000 +0200 @@ -1,0 +2,7 @@ +Tue Mar 29 08:40:08 CEST 2011 - [email protected] + +- version 0.5.1d: + * including previous fixes + * fix possible buffer overflow in awe_read_option_file() + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- awesfx-0.5.1a.tar.bz2 awesfx-autoreconf-fix.diff awesfx-getline-fix.diff awesfx-udev-soundfont-fix.diff New: ---- awesfx-0.5.1d.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ awesfx.spec ++++++ --- /var/tmp/diff_new_pack.VKTCde/_old 2011-03-31 11:13:56.000000000 +0200 +++ /var/tmp/diff_new_pack.VKTCde/_new 2011-03-31 11:13:56.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package awesfx (Version 0.5.1a) +# spec file for package awesfx # -# Copyright (c) 2009 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,16 +21,13 @@ Name: awesfx BuildRequires: alsa-devel Summary: SoundFont Utilities for SB AWE32/64 and Emu10k1 Drivers -Version: 0.5.1a -Release: 85 -License: GPL v2 or later +Version: 0.5.1d +Release: 1 +License: GPLv2+ Group: Productivity/Multimedia/Sound/Midi BuildRoot: %{_tmppath}/%{name}-%{version}-build Url: http://www.alsa-project.org/~iwai/awedrv.html Source: awesfx-%{version}.tar.bz2 -Patch: awesfx-autoreconf-fix.diff -Patch1: awesfx-udev-soundfont-fix.diff -Patch2: awesfx-getline-fix.diff %description The AWESFX package includes utility programs for controlling the @@ -43,10 +40,7 @@ Takashi Iwai <[email protected]> %prep -%setup -%patch -p1 -%patch1 -p1 -%patch2 -p1 +%setup -q %build autoreconf -fi ++++++ awesfx-0.5.1a.tar.bz2 -> awesfx-0.5.1d.tar.bz2 ++++++ ++++ 18798 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/awesfx-0.5.1a/COPYING new/awesfx-0.5.1d/COPYING --- old/awesfx-0.5.1a/COPYING 2004-01-22 17:44:19.000000000 +0100 +++ new/awesfx-0.5.1d/COPYING 2009-05-29 12:33:45.000000000 +0200 @@ -2,7 +2,7 @@ Version 2, June 1991 Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. @@ -313,7 +313,7 @@ If the program is interactive, make it output a short notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author + Gnomovision version 69, Copyright (C) year name of author Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. 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/awesfx-0.5.1a/ChangeLog new/awesfx-0.5.1d/ChangeLog --- old/awesfx-0.5.1a/ChangeLog 2007-08-06 19:17:54.000000000 +0200 +++ new/awesfx-0.5.1d/ChangeLog 2011-03-29 08:33:47.000000000 +0200 @@ -1,3 +1,14 @@ +ver.0.5.1d + - fix possible buffer overflow in awe_read_option_file() + +ver.0.5.1c + - oops, I forgot to package COPYING file, released as 0.5.1c + +ver.0.5.1b + - fix Makefile.am for autoreconf + - fix udev script for recent udev versions (that don't pass + PHYSDEVDRIVER variable) + ver.0.5.1a - really fix the build without linux/awe_voice.h 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/awesfx-0.5.1a/INSTALL new/awesfx-0.5.1d/INSTALL --- old/awesfx-0.5.1a/INSTALL 2007-08-06 19:17:51.000000000 +0200 +++ new/awesfx-0.5.1d/INSTALL 1970-01-01 01:00:00.000000000 +0100 @@ -1,234 +0,0 @@ -Installation Instructions -************************* - -Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005, -2006 Free Software Foundation, Inc. - -This file is free documentation; the Free Software Foundation gives -unlimited permission to copy, distribute and modify it. - -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. - - The `configure' shell script attempts to guess correct values for -various system-dependent variables used during compilation. It uses -those values to create a `Makefile' in each directory of the package. -It may also create one or more `.h' files containing system-dependent -definitions. Finally, it creates a shell script `config.status' that -you can run in the future to recreate the current configuration, and a -file `config.log' containing compiler output (useful mainly for -debugging `configure'). - - 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 -disabled by default to prevent problems with accidental use of stale -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 -diffs or instructions to the address given in the `README' so they can -be considered for the next release. If you are using the cache, and at -some point `config.cache' contains results you don't want to keep, you -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'. - -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. - - Running `configure' might take a while. While running, it prints - some messages telling which features it is checking for. - - 2. Type `make' to compile the package. - - 3. Optionally, type `make check' to run any self-tests that come with - the package. - - 4. Type `make install' to install the programs and any data files and - documentation. - - 5. You can remove the program binaries and object files from the - source code directory by typing `make clean'. To also remove the - files that `configure' created (so you can compile the package for - a different kind of computer), type `make distclean'. There is - also a `make maintainer-clean' target, but that is intended mainly - for the package's developers. If you use it, you may have to get - all sorts of other programs in order to regenerate files that came - with the distribution. - -Compilers and Options -===================== - -Some systems require unusual options for compilation or linking that the -`configure' script does not know about. Run `./configure --help' for -details on some of the pertinent environment variables. - - You can give `configure' initial values for configuration parameters -by setting variables in the command line or in the environment. Here -is an example: - - ./configure CC=c99 CFLAGS=-g LIBS=-lposix - - *Note Defining Variables::, for more details. - -Compiling For Multiple Architectures -==================================== - -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 -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. - -Installation Names -================== - -By default, `make install' installs the package's commands under -`/usr/local/bin', include files under `/usr/local/include', etc. You -can specify an installation prefix other than `/usr/local' by giving -`configure' the option `--prefix=PREFIX'. - - You can specify separate installation prefixes for -architecture-specific files and architecture-independent files. If you -pass the option `--exec-prefix=PREFIX' to `configure', the package uses -PREFIX as the prefix for installing programs and libraries. -Documentation and other data files still use the regular prefix. - - In addition, if you use an unusual directory layout you can give -options like `--bindir=DIR' to specify different values for particular -kinds of files. Run `configure --help' for a list of the directories -you can set and what kinds of files go in them. - - If the package supports it, you can cause programs to be installed -with an extra prefix or suffix on their names by giving `configure' the -option `--program-prefix=PREFIX' or `--program-suffix=SUFFIX'. - -Optional Features -================= - -Some packages pay attention to `--enable-FEATURE' options to -`configure', where FEATURE indicates an optional part of the package. -They may also pay attention to `--with-PACKAGE' options, where PACKAGE -is something like `gnu-as' or `x' (for the X Window System). The -`README' should mention any `--enable-' and `--with-' options that the -package recognizes. - - For packages that use the X Window System, `configure' can usually -find the X include and library files automatically, but if it doesn't, -you can use the `configure' options `--x-includes=DIR' and -`--x-libraries=DIR' to specify their locations. - -Specifying the System Type -========================== - -There may be some features `configure' cannot figure out automatically, -but needs to determine by the type of machine the package will run on. -Usually, assuming the package is built to be run on the _same_ -architectures, `configure' can figure that out, but if it prints a -message saying it cannot guess the machine type, give it the -`--build=TYPE' option. TYPE can either be a short name for the system -type, such as `sun4', or a canonical name which has the form: - - CPU-COMPANY-SYSTEM - -where SYSTEM can have one of these forms: - - OS KERNEL-OS - - See the file `config.sub' for the possible values of each field. If -`config.sub' isn't included in this package, then this package doesn't -need to know the machine type. - - If you are _building_ compiler tools for cross-compiling, you should -use the option `--target=TYPE' to select the type of system they will -produce code for. - - If you want to _use_ a cross compiler, that generates code for a -platform different from the build platform, you should specify the -"host" platform (i.e., that on which the generated programs will -eventually be run) with `--host=TYPE'. - -Sharing Defaults -================ - -If you want to set default values for `configure' scripts to share, you -can create a site shell script called `config.site' that gives default -values for variables like `CC', `cache_file', and `prefix'. -`configure' looks for `PREFIX/share/config.site' if it exists, then -`PREFIX/etc/config.site' if it exists. Or, you can set the -`CONFIG_SITE' environment variable to the location of the site script. -A warning: not all `configure' scripts look for a site script. - -Defining Variables -================== - -Variables not defined in a site shell script can be set in the -environment passed to `configure'. However, some packages may run -configure again during the build, and the customized values of these -variables may be lost. In order to avoid this problem, you should set -them in the `configure' command line, using `VAR=value'. For example: - - ./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). - -Unfortunately, this technique does not work for `CONFIG_SHELL' due to -an Autoconf bug. Until the bug is fixed you can use this workaround: - - CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash - -`configure' Invocation -====================== - -`configure' recognizes the following options to control how it operates. - -`--help' -`-h' - Print a summary of the options to `configure', and exit. - -`--version' -`-V' - Print the version of Autoconf used to generate the `configure' - script, and exit. - -`--cache-file=FILE' - Enable the cache: use and save the results of the tests in FILE, - traditionally `config.cache'. FILE defaults to `/dev/null' to - disable caching. - -`--config-cache' -`-C' - Alias for `--cache-file=config.cache'. - -`--quiet' -`--silent' -`-q' - Do not print messages saying which checks are being made. To - suppress all normal output, redirect it to `/dev/null' (any error - messages will still be shown). - -`--srcdir=DIR' - Look for the package's source code in directory DIR. Usually - `configure' can determine that directory automatically. - -`configure' also accepts some other, not widely useful, options. Run -`configure --help' for more details. - 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/awesfx-0.5.1a/Makefile.am new/awesfx-0.5.1d/Makefile.am --- old/awesfx-0.5.1a/Makefile.am 2007-07-25 11:42:19.000000000 +0200 +++ new/awesfx-0.5.1d/Makefile.am 2009-05-29 12:33:45.000000000 +0200 @@ -3,6 +3,8 @@ bin_PROGRAMS = sfxload asfxload aweset gusload setfx sf2text text2sf sfxtest LDADD = awelib/libawe.a +AUTOMAKE_OPTIONS = foreign + INCLUDES = -Iinclude asfxload_SOURCES = asfxload.c alsa.c 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/awesfx-0.5.1a/awelib/optfile.c new/awesfx-0.5.1d/awelib/optfile.c --- old/awesfx-0.5.1a/awelib/optfile.c 2004-05-28 12:35:24.000000000 +0200 +++ new/awesfx-0.5.1d/awelib/optfile.c 2011-03-29 08:33:47.000000000 +0200 @@ -118,7 +118,8 @@ parse_named_option(DEFAULT_ID); if (fname) { - strcpy(tmp, fname); + strncpy(tmp, fname, sizeof(tmp)); + fname[sizeof(tmp) - 1] = 0; if ((base = strrchr(tmp, '/')) == NULL) base = tmp; /* no directory path is attached */ else 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/awesfx-0.5.1a/configure.in new/awesfx-0.5.1d/configure.in --- old/awesfx-0.5.1a/configure.in 2007-08-06 19:17:36.000000000 +0200 +++ new/awesfx-0.5.1d/configure.in 2011-03-29 08:33:47.000000000 +0200 @@ -1,4 +1,4 @@ -AC_INIT([awesfx],[0.5.1a],[[email protected]],[awesfx]) +AC_INIT([awesfx],[0.5.1d],[[email protected]],[awesfx]) AM_INIT_AUTOMAKE([gnu dist-bzip2]) AC_CONFIG_SRCDIR([asfxload.c]) AM_CONFIG_HEADER([include/config.h]) 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/awesfx-0.5.1a/etc/udev-soundfont new/awesfx-0.5.1d/etc/udev-soundfont --- old/awesfx-0.5.1a/etc/udev-soundfont 2007-07-25 11:38:26.000000000 +0200 +++ new/awesfx-0.5.1d/etc/udev-soundfont 2009-05-29 12:33:45.000000000 +0200 @@ -3,12 +3,14 @@ CARD=${DEVNAME##/dev/snd/hwC} CARD=${CARD%%D2} -case $PHYSDEVDRIVER in -EMU10K1_Audigy) +case $DEVPATH in +*/pci*) + # Emu10k1 / Audigy, send a MIDI sequence to activate breakout-box echo -en "\xf0\x00\x20\x21\x61\x00\x00\x00\x7f\x00\xf7" > /dev/snd/midiC${CARD}D1 /etc/alsa.d/load-soundfont $CARD default.bnk default.sf2 ;; -sbawe) +*) + # SB AWE can use ROM as fallback /etc/alsa.d/load-soundfont $CARD default.bnk default.sf2 default.sbk gu11-rom.sf2 GU11-ROM.SF2 ;; esac 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/awesfx-0.5.1a/include/config.h.in new/awesfx-0.5.1d/include/config.h.in --- old/awesfx-0.5.1a/include/config.h.in 2007-08-06 19:17:50.000000000 +0200 +++ new/awesfx-0.5.1d/include/config.h.in 2011-03-29 08:35:23.000000000 +0200 @@ -1,5 +1,8 @@ /* include/config.h.in. Generated from configure.in by autoheader. */ +/* Define if building universal (internal helper macro) */ +#undef AC_APPLE_UNIVERSAL_BUILD + /* default SoundFont path */ #undef DEFAULT_SF_PATH @@ -57,6 +60,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 @@ -66,6 +72,14 @@ /* Version number of package */ #undef VERSION -/* Define to 1 if your processor stores words with the most significant byte - first (like Motorola and SPARC, unlike Intel and VAX). */ -#undef WORDS_BIGENDIAN +/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most + significant byte first (like Motorola and SPARC, unlike Intel). */ +#if defined AC_APPLE_UNIVERSAL_BUILD +# if defined __BIG_ENDIAN__ +# define WORDS_BIGENDIAN 1 +# endif +#else +# ifndef WORDS_BIGENDIAN +# undef WORDS_BIGENDIAN +# endif +#endif 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/awesfx-0.5.1a/missing new/awesfx-0.5.1d/missing --- old/awesfx-0.5.1a/missing 2007-08-06 19:17:51.000000000 +0200 +++ new/awesfx-0.5.1d/missing 2011-03-29 08:35:24.000000000 +0200 @@ -1,10 +1,10 @@ #! /bin/sh # Common stub for a few missing GNU programs while installing. -scriptversion=2006-05-10.23 +scriptversion=2009-04-28.21; # UTC -# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006, +# 2008, 2009 Free Software Foundation, Inc. # Originally by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -18,9 +18,7 @@ # GNU General Public License for more details. # You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA -# 02110-1301, USA. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a @@ -89,6 +87,9 @@ tar try tar, gnutar, gtar, then tar without non-portable flags yacc create \`y.tab.[ch]', if possible, from existing .[ch] +Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and +\`g' are ignored when checking the name. + Send bug reports to <[email protected]>." exit $? ;; @@ -106,15 +107,22 @@ esac +# normalize program name to check for. +program=`echo "$1" | sed ' + s/^gnu-//; t + s/^gnu//; t + s/^g//; t'` + # 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). +# the program). This is about non-GNU programs, so use $1 not +# $program. case $1 in - lex|yacc) + lex*|yacc*) # Not GNU programs, they don't have --version. ;; - tar) + tar*) if test -n "$run"; then echo 1>&2 "ERROR: \`tar' requires --run" exit 1 @@ -138,7 +146,7 @@ # If it does not exist, or fails to run (possibly an outdated version), # try to emulate it. -case $1 in +case $program in aclocal*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if @@ -148,7 +156,7 @@ touch aclocal.m4 ;; - autoconf) + autoconf*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`${configure_ac}'. You might want to install the @@ -157,7 +165,7 @@ touch configure ;; - autoheader) + autoheader*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified \`acconfig.h' or \`${configure_ac}'. You might want @@ -187,7 +195,7 @@ while read f; do touch "$f"; done ;; - autom4te) + autom4te*) echo 1>&2 "\ WARNING: \`$1' is needed, but is $msg. You might have modified some files without having the @@ -210,7 +218,7 @@ fi ;; - bison|yacc) + bison*|yacc*) echo 1>&2 "\ WARNING: \`$1' $msg. You should only need it if you modified a \`.y' file. You may need the \`Bison' package @@ -240,7 +248,7 @@ fi ;; - lex|flex) + lex*|flex*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.l' file. You may need the \`Flex' package @@ -263,7 +271,7 @@ fi ;; - help2man) + help2man*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a dependency of a manual page. You may need the @@ -277,11 +285,11 @@ else test -z "$file" || exec >$file echo ".ab help2man is required to generate this page" - exit 1 + exit $? fi ;; - makeinfo) + makeinfo*) echo 1>&2 "\ WARNING: \`$1' is $msg. You should only need it if you modified a \`.texi' or \`.texinfo' file, or any other file @@ -310,7 +318,7 @@ touch $file ;; - tar) + tar*) shift # We have already tried tar in the generic part. @@ -363,5 +371,6 @@ # eval: (add-hook 'write-file-hooks 'time-stamp) # time-stamp-start: "scriptversion=" # time-stamp-format: "%:y-%02m-%02d.%02H" -# time-stamp-end: "$" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" # End: 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/awesfx-0.5.1a/setfx.c new/awesfx-0.5.1d/setfx.c --- old/awesfx-0.5.1a/setfx.c 2007-07-25 11:32:53.000000000 +0200 +++ new/awesfx-0.5.1d/setfx.c 2009-05-29 12:34:14.000000000 +0200 @@ -37,7 +37,7 @@ /*----------------------------------------------------------------*/ static void usage(void); -static int getline(FILE *fp); +static int my_getline(FILE *fp); static int nextline(FILE *fp); static char *gettok(FILE *fp); static char *divtok(char *src, char *divs, int only_one); @@ -126,7 +126,7 @@ } curline = 0; - if (!getline(fp)) + if (!my_getline(fp)) return 0; seq_init(seq_devname, seq_devidx); @@ -370,7 +370,7 @@ * read a line and parse tokens *----------------------------------------------------------------*/ -static int getline(FILE *fp) +static int my_getline(FILE *fp) { char *p; curline++; @@ -393,12 +393,12 @@ { if (connected) { do { - if (! getline(fp)) + if (! my_getline(fp)) return FALSE; } while (connected); return TRUE; } else { - return getline(fp); + return my_getline(fp); } } @@ -415,7 +415,7 @@ tok = divtok(NULL, " \t\r\n", FALSE); while (tok == NULL || *tok == 0) { if (! connected) return NULL; - if (! getline(fp)) return NULL; + if (! my_getline(fp)) return NULL; tok = divtok(line, " \t\r\n", FALSE); } return tok; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
