Hello community, here is the log from the commit of package makedepend for openSUSE:Factory checked in at 2019-03-26 22:29:52 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/makedepend (Old) and /work/SRC/openSUSE:Factory/.makedepend.new.25356 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "makedepend" Tue Mar 26 22:29:52 2019 rev:8 rq:687648 version:1.0.6 Changes: -------- --- /work/SRC/openSUSE:Factory/makedepend/makedepend.changes 2016-03-29 09:52:06.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.makedepend.new.25356/makedepend.changes 2019-03-26 22:29:53.677742386 +0100 @@ -1,0 +2,9 @@ +Fri Mar 22 11:47:42 UTC 2019 - Stefan Dirsch <[email protected]> + +- Update to version 1.0.6 + * This minor maintenance release fixes some bugs, lifts a limit, + clears some compiler warnings, boosts performance, and includes + other janitorial cleanups. +- supersedes u_Escape-special-characters-in-paths.patch + +------------------------------------------------------------------- Old: ---- makedepend-1.0.5.tar.bz2 u_Escape-special-characters-in-paths.patch New: ---- makedepend-1.0.6.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ makedepend.spec ++++++ --- /var/tmp/diff_new_pack.x5mTvq/_old 2019-03-26 22:29:54.189742263 +0100 +++ /var/tmp/diff_new_pack.x5mTvq/_new 2019-03-26 22:29:54.193742262 +0100 @@ -1,7 +1,7 @@ # # spec file for package makedepend # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,14 +17,13 @@ Name: makedepend -Version: 1.0.5 +Version: 1.0.6 Release: 0 Summary: Utility to create dependencies in makefiles License: MIT Group: Development/Tools/Building Url: http://xorg.freedesktop.org/ Source0: http://xorg.freedesktop.org/releases/individual/util/%{name}-%{version}.tar.bz2 -Patch1: u_Escape-special-characters-in-paths.patch BuildRequires: pkg-config BuildRequires: pkgconfig(xorg-macros) >= 1.8 BuildRequires: pkgconfig(xproto) >= 7.0.17 @@ -43,7 +42,6 @@ %prep %setup -q -%patch1 -p1 %build %configure @@ -54,7 +52,7 @@ %files %defattr(-,root,root) -%doc AUTHORS ChangeLog COPYING README +%doc AUTHORS ChangeLog COPYING README.md %{_bindir}/makedepend %{_mandir}/man1/makedepend.1%{?ext_man} ++++++ makedepend-1.0.5.tar.bz2 -> makedepend-1.0.6.tar.bz2 ++++++ ++++ 8513 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/makedepend-1.0.5/ChangeLog new/makedepend-1.0.6/ChangeLog --- old/makedepend-1.0.5/ChangeLog 2013-07-23 07:15:10.000000000 +0200 +++ new/makedepend-1.0.6/ChangeLog 2019-03-17 00:41:50.000000000 +0100 @@ -1,3 +1,170 @@ +commit e4971e9507f989d68c97a92edd1e6e1881ad1d55 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 16 16:39:07 2019 -0700 + + makedepend 1.0.6 + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 7897a5b8edd142d4de63933db3e544262006289e +Author: Alan Coopersmith <[email protected]> +Date: Fri Dec 7 20:35:14 2018 -0800 + + Update configure.ac bug URL for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 277eaf65d43f9fe9d3d223810e1872c32436c01e +Author: Alan Coopersmith <[email protected]> +Date: Mon Nov 19 23:40:18 2018 -0800 + + Update README for gitlab migration + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit d15117c98a071b8fd30fb163fc45cb37db760654 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 5 10:54:59 2018 -0700 + + Simplify writing of output lines to Makefile + + Instead of writing everything to a temporary buffer, and then using + fwrite() to have it fputc() one character at a time into the stdio + buffer, just use fprintf() directly to save a copy and write in + larger blocks. + + Testing on Solaris on makedepend's own source files showed a + reduction in memcpy's from 4037 to 3108, and in _dowrite calls + in stdio from 1173 to 168, but no change in actual write calls + from stdio's buffer to the file. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 4f410f3ed29fdb0f98be1e01930ba1a909a36ef0 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 5 10:05:44 2018 -0700 + + Remove unused variable whitespace + + Use of it was removed in commit 275c17136006f9d, but we kept setting + it anyway. + + Resolves gcc 7.3 warning: + main.c: In function ‘getnextline’: + main.c:587:10: warning: variable ‘whitespace’ set but not used [-Wunused-but-set-variable] + boolean whitespace = FALSE; + ^~~~~~~~~~ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 223b315a9148ec0091837f2e369bbb3ec5d49e11 +Author: Alan Coopersmith <[email protected]> +Date: Sat May 5 10:00:38 2018 -0700 + + Fix bad indentation in ifparser.c + + ifparser.c: In function ‘parse_product’: + ifparser.c:300:5: warning: this ‘else’ clause does not guard... [-Wmisleading-indentation] + else + ^~~~ + ifparser.c:302:2: note: ...this statement, but the latter is misleadingly indented as if it were guarded by the ‘else’ + break; + ^~~~~ + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 13385d8add69156805f824cedcdad2986a23662d +Author: Antonio Larrosa <[email protected]> +Date: Tue Feb 2 18:31:27 2016 +0100 + + Quote colons in filenames/paths + + Makefile doesn't like colons in filenames/paths so they must + be quoted in the output. Otherwise makedepend doesn't work with + full paths that contain a colon. + + V2: Use quoted filename when measuring name length + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 5fb14ee51f849ec86c109bae101ae3f7b7ed7e39 +Author: David Boyce <[email protected]> +Date: Fri Dec 27 18:50:38 2013 -0800 + + Bumped -I flag limit in makedepend from 64 to 512. + + Clearly a limit of 64 -I flags is too low (we hit it); it might be + a good style recommendation but shouldn't be a hard limit. + 512 is a fairly random replacement value. + + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 0860822bb2a1bbc6e40758e2e6413181b26b6b04 +Author: Dirk <[email protected]> +Date: Thu Feb 11 18:48:13 2016 +0000 + + missing bounds check in makedepend for file arguments + + When assigning source code files from the command line to the fp pointer, + no bounds check is done and if more than MAXFILES file names are specified + on the command line, memory will be overridden out of bounds. + + https://bugs.freedesktop.org/show_bug.cgi?id=94099 + + Reviewed-by: Alan Coopersmith <[email protected]> + Tested-by: Alan Coopersmith <[email protected]> + Signed-off-by: Alan Coopersmith <[email protected]> + +commit 72cc0b7713b28ffd03271526c81d1ad9d2183a82 +Author: Mihail Konev <[email protected]> +Date: Thu Jan 26 13:52:49 2017 +1000 + + autogen: add default patch prefix + + Signed-off-by: Mihail Konev <[email protected]> + +commit f11006e04bb87b060cc6a5b64f4dd0eeb8b3447f +Author: Emil Velikov <[email protected]> +Date: Mon Mar 9 12:00:52 2015 +0000 + + autogen.sh: use quoted string variables + + Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent + fall-outs, when they contain space. + + Signed-off-by: Emil Velikov <[email protected]> + Reviewed-by: Peter Hutterer <[email protected]> + Signed-off-by: Peter Hutterer <[email protected]> + +commit c5cc6e0ff2d60133a4b7560df67607ceeb9d55a6 +Author: Peter Hutterer <[email protected]> +Date: Tue Jan 24 10:32:07 2017 +1000 + + autogen.sh: use exec instead of waiting for configure to finish + + Syncs the invocation of configure with the one from the server. + + Signed-off-by: Peter Hutterer <[email protected]> + Reviewed-by: Emil Velikov <[email protected]> + +commit a4f82f917a9b0802b70cd80c21d2e53688e2b9b3 +Author: Alan Coopersmith <[email protected]> +Date: Sat Mar 12 10:11:03 2016 -0800 + + Use do { ... } while(0) idiom to make debug() macro safer + + Cleans up several -Wempty-body warnings from gcc 5.3 + + Signed-off-by: Alan Coopersmith <[email protected]> + Reviewed-by: Adam Jackson <[email protected]> + +commit 9da873c5a036c95aa24a7dc3562d405609262381 +Author: Alan Coopersmith <[email protected]> +Date: Fri Aug 2 21:49:39 2013 -0700 + + Constify a pair of local string pointers + + Signed-off-by: Alan Coopersmith <[email protected]> + commit 30859adfd6a6523a92a637ca26bd61ce59680a1b Author: Alan Coopersmith <[email protected]> Date: Mon Jul 22 22:14:36 2013 -0700 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/makedepend-1.0.5/Makefile.am new/makedepend-1.0.6/Makefile.am --- old/makedepend-1.0.5/Makefile.am 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/Makefile.am 2019-03-17 00:41:38.000000000 +0100 @@ -15,7 +15,7 @@ AM_CPPFLAGS += $(X_CFLAGS) AM_CFLAGS = $(CWARNFLAGS) -EXTRA_DIST = autogen.sh makedepend.man +EXTRA_DIST = autogen.sh makedepend.man README.md # Man page appmandir = $(APP_MAN_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/makedepend-1.0.5/README new/makedepend-1.0.6/README --- old/makedepend-1.0.5/README 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/README 1970-01-01 01:00:00.000000000 +0100 @@ -1,25 +0,0 @@ -makedepend - create dependencies in makefiles - -All questions regarding this software should be directed at the -Xorg mailing list: - - http://lists.freedesktop.org/mailman/listinfo/xorg - -Please submit bug reports to the Xorg bugzilla: - - https://bugs.freedesktop.org/enter_bug.cgi?product=xorg - -The master development code repository can be found at: - - git://anongit.freedesktop.org/git/xorg/util/makedepend - - http://cgit.freedesktop.org/xorg/util/makedepend - -For patch submission instructions, see: - - http://www.x.org/wiki/Development/Documentation/SubmittingPatches - -For more information on the git code manager, see: - - http://wiki.x.org/wiki/GitPage - 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/makedepend-1.0.5/README.md new/makedepend-1.0.6/README.md --- old/makedepend-1.0.5/README.md 1970-01-01 01:00:00.000000000 +0100 +++ new/makedepend-1.0.6/README.md 2019-03-17 00:41:38.000000000 +0100 @@ -0,0 +1,20 @@ +makedepend - create dependencies in makefiles +--------------------------------------------- + +makedepend parses C sources to make dependency lists for Makefiles. + +All questions regarding this software should be directed at the +Xorg mailing list: + + https://lists.x.org/mailman/listinfo/xorg + +The master development code repository can be found at: + + https://gitlab.freedesktop.org/xorg/util/makedepend + +Please submit bug reports and requests to merge patches there. + +For patch submission instructions, see: + + https://www.x.org/wiki/Development/Documentation/SubmittingPatches + 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/makedepend-1.0.5/autogen.sh new/makedepend-1.0.6/autogen.sh --- old/makedepend-1.0.5/autogen.sh 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/autogen.sh 2019-03-17 00:41:38.000000000 +0100 @@ -1,15 +1,17 @@ #! /bin/sh - -srcdir=`dirname $0` +srcdir=`dirname "$0"` test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd "$srcdir" autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd "$ORIGDIR" || exit $? + +git config --local --get format.subjectPrefix >/dev/null 2>&1 || + git config --local format.subjectPrefix "PATCH util/makedepend" if test -z "$NOCONFIGURE"; then - $srcdir/configure "$@" + exec "$srcdir"/configure "$@" fi 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/makedepend-1.0.5/compile new/makedepend-1.0.6/compile --- old/makedepend-1.0.5/compile 2013-07-23 07:14:53.000000000 +0200 +++ new/makedepend-1.0.6/compile 2019-03-17 00:41:42.000000000 +0100 @@ -3,7 +3,7 @@ scriptversion=2012-10-14.11; # UTC -# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Copyright (C) 1999-2014 Free Software Foundation, Inc. # Written by Tom Tromey <[email protected]>. # # This program is free software; you can redistribute it and/or modify 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/makedepend-1.0.5/configure.ac new/makedepend-1.0.6/configure.ac --- old/makedepend-1.0.5/configure.ac 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/configure.ac 2019-03-17 00:41:38.000000000 +0100 @@ -3,8 +3,8 @@ # Initialize Autoconf AC_PREREQ([2.60]) -AC_INIT([makedepend], [1.0.5], - [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg]) +AC_INIT([makedepend], [1.0.6], + [https://gitlab.freedesktop.org/xorg/util/makedepend/issues]) AC_CONFIG_SRCDIR([Makefile.am]) AC_CONFIG_HEADERS([makedepend-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/makedepend-1.0.5/def.h new/makedepend-1.0.6/def.h --- old/makedepend-1.0.5/def.h 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/def.h 2019-03-17 00:41:38.000000000 +0100 @@ -41,7 +41,7 @@ #define MAXDEFINES 512 #define MAXFILES 2048 #define MAXINCFILES 128 /* "-include" files */ -#define MAXDIRS 64 +#define MAXDIRS 512 /* -I flags */ #define SYMTABINC 10 /* must be > 1 for define() to work right */ #define TRUE 1 #define FALSE 0 @@ -82,9 +82,9 @@ * 3 show #include SYMBOL * 4-6 unused */ -#define debug(level,arg) { if (_debugmask & (1 << level)) warning arg; } +#define debug(level,arg) do { if (_debugmask & (1 << level)) warning arg; } while(0) #else -#define debug(level,arg) /**/ +#define debug(level,arg) do { /**/ } while (0) #endif /* DEBUG */ typedef unsigned char boolean; 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/makedepend-1.0.5/ifparser.c new/makedepend-1.0.6/ifparser.c --- old/makedepend-1.0.5/ifparser.c 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/ifparser.c 2019-03-17 00:41:38.000000000 +0100 @@ -295,10 +295,10 @@ case '/': DO (cp = parse_product (g, cp + 1, &rightval)); - if (rightval) + if (rightval) *valp = (*valp / rightval); - else - *valp = LONG_MAX; + else + *valp = LONG_MAX; break; case '%': 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/makedepend-1.0.5/main.c new/makedepend-1.0.6/main.c --- old/makedepend-1.0.5/main.c 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/main.c 2019-03-17 00:41:38.000000000 +0100 @@ -232,6 +232,9 @@ /* treat +thing as an option for C++ */ if (endmarker && **argv == '+') continue; + if (fp >= filelist + MAXFILES) { + fatalerr("Too many source files. Limit is %i files.\n", MAXFILES); + } *fp++ = argv[0]; continue; } @@ -581,7 +584,6 @@ *eof, /* end of file pointer */ *bol; /* beginning of line pointer */ int lineno; /* line number */ - boolean whitespace = FALSE; /* * Fake the "-include" line files in form of #include to the @@ -611,7 +613,6 @@ p++; bol++; } - whitespace = TRUE; } if (*p == '/' && (p+1) < eof && *(p+1) == '*') { @@ -683,7 +684,6 @@ --p; } bol = p+1; - whitespace = FALSE; } } if (*bol != '#') 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/makedepend-1.0.5/makedepend-config.h.in new/makedepend-1.0.6/makedepend-config.h.in --- old/makedepend-1.0.5/makedepend-config.h.in 2013-07-23 07:14:52.000000000 +0200 +++ new/makedepend-1.0.6/makedepend-config.h.in 2019-03-17 00:41:41.000000000 +0100 @@ -69,6 +69,11 @@ /* Version number of package */ #undef VERSION +/* Enable large inode numbers on Mac OS X 10.5. */ +#ifndef _DARWIN_USE_64_BIT_INODE +# define _DARWIN_USE_64_BIT_INODE 1 +#endif + /* Number of bits in a file offset, on hosts where this is settable. */ #undef _FILE_OFFSET_BITS 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/makedepend-1.0.5/missing new/makedepend-1.0.6/missing --- old/makedepend-1.0.5/missing 2013-07-23 07:14:53.000000000 +0200 +++ new/makedepend-1.0.6/missing 2019-03-17 00:41:42.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # Common wrapper for a few potentially missing GNU programs. -scriptversion=2012-06-26.16; # UTC +scriptversion=2013-10-28.13; # UTC -# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# Copyright (C) 1996-2014 Free Software Foundation, Inc. # Originally written by Fran,cois Pinard <[email protected]>, 1996. # This program is free software; you can redistribute it and/or modify @@ -160,7 +160,7 @@ ;; autom4te*) echo "You might have modified some maintainer files that require" - echo "the 'automa4te' program to be rebuilt." + echo "the 'autom4te' program to be rebuilt." program_details 'autom4te' ;; bison*|yacc*) 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/makedepend-1.0.5/parse.c new/makedepend-1.0.6/parse.c --- old/makedepend-1.0.5/parse.c 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/parse.c 2019-03-17 00:41:38.000000000 +0100 @@ -496,8 +496,8 @@ while ((last1 >= first1) && (last2 >= first2)) { - char *s1=file1->i_defs[first1]->s_name; - char *s2=file2->i_defs[first2]->s_name; + const char *s1 = file1->i_defs[first1]->s_name; + const char *s2 = file2->i_defs[first2]->s_name; if (strcmp(s1,s2) < 0) i_defs[first++]=file1->i_defs[first1++]; 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/makedepend-1.0.5/pr.c new/makedepend-1.0.6/pr.c --- old/makedepend-1.0.5/pr.c 2013-07-23 07:14:47.000000000 +0200 +++ new/makedepend-1.0.6/pr.c 2019-03-17 00:41:38.000000000 +0100 @@ -63,28 +63,65 @@ } } +/** + * Replaces all ":" occurrences in @p input with "\:" using @p outputbuffer (of size @p bufsize) + * possibly to hold the result. @p returns the string with quoted colons + */ +static const char * +quoteColons(const char *input, char *outputbuffer, size_t bufsize) +{ + const char *tmp=input; + const char *loc; + char *output=outputbuffer; + + loc = strchr(input, ':'); + if (loc == NULL) { + return input; + } + + tmp=input; + while (loc != NULL && bufsize > loc-tmp+2 ) { + memcpy(output, tmp, loc-tmp); + output+=loc-tmp; + bufsize-=loc-tmp+2; + tmp=loc+1; + *output='\\'; + output++; + *output=':'; + output++; + loc = strchr(tmp, ':'); + } + + if (strlen(tmp) <= bufsize) + strcpy(output, tmp); + else { + strncpy(output, tmp, bufsize-1); + output[bufsize]=0; + } + return outputbuffer; +} + static void pr(struct inclist *ip, const char *file, const char *base) { static const char *lastfile; static int current_len; register int len, i; - char buf[ BUFSIZ ]; + const char * quoted; + char quotebuf[ BUFSIZ ]; printed = TRUE; - len = strlen(ip->i_file)+1; + quoted = quoteColons(ip->i_file, quotebuf, sizeof(quotebuf)); + len = strlen(quoted)+1; if (current_len + len > width || file != lastfile) { lastfile = file; - snprintf(buf, sizeof(buf), "\n%s%s%s: %s", - objprefix, base, objsuffix, ip->i_file); - len = current_len = strlen(buf); + current_len = fprintf(stdout, "\n%s%s%s: %s", + objprefix, base, objsuffix, quoted); } else { - buf[0] = ' '; - strcpy(buf+1, ip->i_file); + fprintf(stdout, " %s", quoted); current_len += len; } - fwrite(buf, len, 1, stdout); /* * If verbose is set, then print out what this file includes. 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/makedepend-1.0.5/test-driver new/makedepend-1.0.6/test-driver --- old/makedepend-1.0.5/test-driver 2013-07-23 07:14:53.000000000 +0200 +++ new/makedepend-1.0.6/test-driver 2019-03-17 00:41:42.000000000 +0100 @@ -1,9 +1,9 @@ #! /bin/sh # test-driver - basic testsuite driver script. -scriptversion=2012-06-27.10; # UTC +scriptversion=2013-07-13.22; # UTC -# Copyright (C) 2011-2013 Free Software Foundation, Inc. +# Copyright (C) 2011-2014 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 @@ -44,13 +44,12 @@ Usage: test-driver --test-name=NAME --log-file=PATH --trs-file=PATH [--expect-failure={yes|no}] [--color-tests={yes|no}] - [--enable-hard-errors={yes|no}] [--] TEST-SCRIPT + [--enable-hard-errors={yes|no}] [--] + TEST-SCRIPT [TEST-SCRIPT-ARGUMENTS] The '--test-name', '--log-file' and '--trs-file' options are mandatory. END } -# TODO: better error handling in option parsing (in particular, ensure -# TODO: $log_file, $trs_file and $test_name are defined). test_name= # Used for reporting. log_file= # Where to save the output of the test script. trs_file= # Where to save the metadata of the test run. @@ -69,10 +68,23 @@ --enable-hard-errors) enable_hard_errors=$2; shift;; --) shift; break;; -*) usage_error "invalid option: '$1'";; + *) break;; esac shift done +missing_opts= +test x"$test_name" = x && missing_opts="$missing_opts --test-name" +test x"$log_file" = x && missing_opts="$missing_opts --log-file" +test x"$trs_file" = x && missing_opts="$missing_opts --trs-file" +if test x"$missing_opts" != x; then + usage_error "the following mandatory options are missing:$missing_opts" +fi + +if test $# -eq 0; then + usage_error "missing argument" +fi + if test $color_tests = yes; then # Keep this in sync with 'lib/am/check.am:$(am__tty_colors)'. red='[0;31m' # Red. @@ -94,11 +106,14 @@ # Test script is run here. "$@" >$log_file 2>&1 estatus=$? + if test $enable_hard_errors = no && test $estatus -eq 99; then - estatus=1 + tweaked_estatus=1 +else + tweaked_estatus=$estatus fi -case $estatus:$expect_failure in +case $tweaked_estatus:$expect_failure in 0:yes) col=$red res=XPASS recheck=yes gcopy=yes;; 0:*) col=$grn res=PASS recheck=no gcopy=no;; 77:*) col=$blu res=SKIP recheck=no gcopy=yes;; @@ -107,6 +122,12 @@ *:*) col=$red res=FAIL recheck=yes gcopy=yes;; esac +# Report the test outcome and exit status in the logs, so that one can +# know whether the test passed or failed simply by looking at the '.log' +# file, without the need of also peaking into the corresponding '.trs' +# file (automake bug#11814). +echo "$res $test_name (exit status: $estatus)" >>$log_file + # Report outcome to console. echo "${col}${res}${std}: $test_name"
