Hello community, here is the log from the commit of package c_count for openSUSE:Factory checked in at 2014-06-19 13:20:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/c_count (Old) and /work/SRC/openSUSE:Factory/.c_count.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "c_count" Changes: -------- --- /work/SRC/openSUSE:Factory/c_count/c_count.changes 2012-02-16 14:55:21.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.c_count.new/c_count.changes 2014-06-19 13:20:18.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Jun 17 12:02:55 UTC 2014 - [email protected] + +- Version bump to 7.14: + * cross compiling support + * configure script updates + * minor fix to Quoted + +------------------------------------------------------------------- Old: ---- c_count-7.12.tgz New: ---- c_count-7.14.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ c_count.spec ++++++ --- /var/tmp/diff_new_pack.EGEfSr/_old 2014-06-19 13:20:19.000000000 +0200 +++ /var/tmp/diff_new_pack.EGEfSr/_new 2014-06-19 13:20:19.000000000 +0200 @@ -1,8 +1,7 @@ -# vim: set sw=4 ts=4 et nu: # # spec file for package c_count # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany. # Copyright (c) 2012 Pascal Bleser <[email protected]> # # All modifications and additions to the file contributed by third parties @@ -19,20 +18,20 @@ Name: c_count -Version: 7.12 +Version: 7.14 Release: 0 Summary: Source Code Measure Counter for C/C++/Java License: MIT Group: Development/Tools/Other -Source: ftp://invisible-island.net/c_count/c_count-%{version}.tgz Url: http://invisible-island.net/c_count/ -BuildRoot: %{_tmppath}/%{name}-%{version}-build +Source: ftp://invisible-island.net/c_count/c_count-%{version}.tgz BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc BuildRequires: glibc-devel BuildRequires: libtool BuildRequires: make +BuildRoot: %{_tmppath}/%{name}-%{version}-build %description c_count counts lines, statements, and other simple measures of C/C++/Java @@ -46,19 +45,16 @@ %configure \ --enable-warnings -%__make %{?_smp_mflags} +make %{?_smp_mflags} %install -%makeinstall +make DESTDIR=%{buildroot} install %{?_smp_mflags} %check pushd testing ./run_test.sh popd #testing -%clean -%{?buildroot:%__rm -rf "%{buildroot}"} - %files %defattr(-,root,root) %doc COPYING CHANGES README ++++++ c_count-7.12.tgz -> c_count-7.14.tgz ++++++ ++++ 5148 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/c_count-7.12/CHANGES new/c_count-7.14/CHANGES --- old/c_count-7.12/CHANGES 2010-07-17 15:57:26.000000000 +0200 +++ new/c_count-7.14/CHANGES 2013-12-14 16:56:54.000000000 +0100 @@ -1,6 +1,27 @@ --- $Id: CHANGES,v 7.21 2010/07/17 13:57:26 tom Exp $ +-- $Id: CHANGES,v 7.27 2013/12/14 15:56:54 tom Exp $ -2010/7/17 (c_count 7.12) +2013/12/14 (c_count 7.14) + + add script for cross-compiling NullSoft installer to MinGW. + + + minor fix for Quoted(); if the first character of a quoted string was + a blank, it was added to the blanks category rather than to code. + + + improve cross-compiling, to supply getopt from porting directory + for systems which lack this. + + + updated configure macros + + + update config.guess and config.sub + +2010/08/24 (c_count 7.13) + + + pretend that MinGW does globbing. + + + updated configure macros + + + update config.guess and config.sub + +2010/07/17 (c_count 7.12) + escape dashes in manpage as needed to work around groff. @@ -26,7 +47,7 @@ + reformat changelog, for metrics script. -2006/1/8 (c_count 7.11) +2006/01/08 (c_count 7.11) + correct bookkeeping for unterminated blocks (report by Lester Ingber). @@ -68,7 +89,7 @@ + add -V option, to show version. -2001/2/27 (c_count 7.7) +2001/02/27 (c_count 7.7) + expand wildcards on WIN32 with _setargv(). @@ -76,28 +97,28 @@ + Updated configure script. -1999/1/11 +1999/01/11 + add check for files w/o trailing newline. -1998/8/3 (c_count 7.6) +1998/08/03 (c_count 7.6) + modify configure script to work with --srcdir (reported by Marty Leisner). -1998/7/2 (c_count 7.5) +1998/07/02 (c_count 7.5) + implement check for mismatched braces. + add -w option, to show too-long identifiers -1997/10/5 (c_count 7.4) +1997/10/05 (c_count 7.4) + change copyright terms to allow commerical distribution. + add -b option, to display blocklevel statistics. -1997/4/25 (c_count 7.3) +1997/04/25 (c_count 7.3) + correct state-parsing of "/*<LF>", supplied test. 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/c_count-7.12/COPYING new/c_count-7.14/COPYING --- old/c_count-7.12/COPYING 2010-07-17 12:16:38.000000000 +0200 +++ new/c_count-7.14/COPYING 2013-08-24 21:14:26.000000000 +0200 @@ -1,10 +1,10 @@ -$Id: COPYING,v 7.8 2010/07/17 10:16:38 tom Exp $ +$Id: COPYING,v 7.9 2013/08/24 19:14:26 tom Exp $ C_COUNT -------------------------------------------------------------------------------- -Copyright 1985-2006,2010 by Thomas E. Dickey +Copyright 1985-2010,2013 by Thomas E. Dickey All Rights Reserved. Permission to use, copy, modify, and distribute this software and its 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/c_count-7.12/MANIFEST new/c_count-7.14/MANIFEST --- old/c_count-7.12/MANIFEST 2006-01-08 17:24:15.000000000 +0100 +++ new/c_count-7.14/MANIFEST 2013-12-14 21:55:07.000000000 +0100 @@ -1,4 +1,4 @@ -MANIFEST for c_count-7.11, version v7_11 +MANIFEST for c_count-7.14, version v7_14 -------------------------------------------------------------------------------- MANIFEST this file CHANGES extracted change-log from c_count.c @@ -12,13 +12,25 @@ config.sub substitute configuration configure Configuration script for UNIX configure.in autoconf-template for C_COUNT -configure Configuration script for UNIX descrip.mms VMS build-script for C_COUNT -install.sh install-script from X11 +install-sh install-script from X11 makefile.in makefile-template for C_COUNT -mkdirs.sh mkinstalldirs script (renamed for porting) patchlev.h patch-level of C_COUNT system.h template for autoconf includes +package subdirectory +package/c_count.nsi build-script +package/c_count.spec RPM build-script for c_count +package/debian subdirectory +package/debian/changelog debian build script +package/debian/compat debian build script +package/debian/control debian build script +package/debian/copyright debian build script +package/debian/docs debian build script +package/debian/rules debian build script +package/debian/source subdirectory +package/debian/source/format debian build script +package/debian subdirectory +package/debian/watch debian build script porting subdirectory porting/README description of files in porting directory porting/getopt.c public-domain version of 'getopt()' 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/c_count-7.12/c_count.c new/c_count-7.14/c_count.c --- old/c_count-7.12/c_count.c 2010-07-18 02:12:14.000000000 +0200 +++ new/c_count-7.14/c_count.c 2013-12-14 14:45:23.000000000 +0100 @@ -3,6 +3,10 @@ * Author: T.E.Dickey * Created: 04 Dec 1985 * Modified: + * 14 Dec 2013, minor fix for Quoted(); if the first character of + * a quoted string was a blank, it was added to the + * blanks category rather than to code. + * 24 Aug 2013, ifdef to assume MinGW does globbing. * 16 Jul 2010, fix strict compiler warnings, e.g., with const. * 08 Jan 2006, correct bookkeeping for unterminated blocks. * 17 Jul 2005, show statement numbers at the beginning of a @@ -75,7 +79,7 @@ * can get reasonable counts for ddn-driver, etc. * Also fixed printf-formats for xenix-port. * 23 Apr 1986, treat standard-input as a list of names, not code. - * 28 Jan 1985, make final 'exit()' with return code. + * 28 Jan 1986, make final 'exit()' with return code. * * Function: Count lines and statements in one or more C program files, * giving statistics on percentage commented. @@ -94,7 +98,7 @@ #include "patchlev.h" #ifndef NO_IDENT -static const char Id[] = "$Id: c_count.c,v 7.55 2010/07/18 00:12:14 tom Exp $"; +static const char Id[] = "$Id: c_count.c,v 7.59 2013/12/14 13:45:23 tom Exp $"; #endif #include <stdio.h> @@ -164,6 +168,10 @@ #define LVL_WEIGHT(n) if (opt_blok) One.lvl_weights += (n) * (One.nesting_lvl+1) +#if defined(WIN32) && (defined(__MINGW32__) || defined(__MINGW64__)) +int _dowildard = -1; +#endif + /* * To make the verbose listing look nice (without doing tab-conversion), we * want to have the columns for statements, lines, error flags add up to @@ -179,7 +187,7 @@ static int inFile(void); static int Comment(int cpp); static int Escape(void); -static int String(int mark); +static int Quoted(int mark); static FILE *File; static char **quotvec; @@ -568,9 +576,9 @@ while (c == ' ' || c == '\t') c = inFile(); if (c == '"') - c = String(c); + c = Quoted(c); else if (c == '<') - c = String('>'); + c = Quoted('>'); return c; } @@ -624,7 +632,7 @@ if (c == ' ' || c == '\t' || c == '(') { for (j = 0; j < quotdef; j++) { if (!strcmp(quotvec[j], bfr)) { - c = String('"'); + c = Quoted('"'); DEBUG("**%c**\n", c); break; } @@ -858,7 +866,7 @@ break; case '"': case '\'': - c = String(c); + c = Quoted(c); break; case '{': DEBUG("char\t%c\n", c); @@ -944,14 +952,15 @@ * string (perhaps because the leading quote was in a macro!). */ static int -String(int mark) +Quoted(int mark) { - int c = inFile(); static const char *sccs_tag = "@(#)"; const char *p = sccs_tag; /* permit literal tab here only! */ + int c; DEBUG("string\t%c", (mark == '>') ? '<' : mark); literal = TRUE; + c = inFile(); while (c != EOF) { if (c == '\n') { /* this is legal, but not likely */ One.flags_unquo++; /* ...assume balance is in macro */ @@ -1300,7 +1309,7 @@ int j; char name[BUFSIZ]; -#ifdef WIN32 +#if defined(WIN32) && !(defined(__MINGW32__) || defined(__MINGW64__)) _setargv(&argc, &argv); #endif quotvec = typeCalloc(char *, (size_t) argc); 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/c_count-7.12/configure.in new/c_count-7.14/configure.in --- old/c_count-7.12/configure.in 2010-07-17 02:04:51.000000000 +0200 +++ new/c_count-7.14/configure.in 2013-10-07 18:38:03.000000000 +0200 @@ -1,6 +1,6 @@ dnl Process this file with 'autoconf' to produce a 'configure' script -dnl $Id: configure.in,v 7.10 2010/07/17 00:04:51 tom Exp $ -AC_REVISION($Revision: 7.10 $) +dnl $Id: configure.in,v 7.13 2013/10/07 16:38:03 tom Exp $ +AC_REVISION($Revision: 7.13 $) AC_PREREQ(2.13.20020210) AC_INIT(c_count.c) AC_CONFIG_HEADER(config.h:config.hin) @@ -27,5 +27,12 @@ AC_HAVE_FUNCS(strchr getopt) CF_GETOPT_HEADER +if test $ac_cv_func_getopt = 'no' +then + CPPFLAGS="$CPPFLAGS -I\$(srcdir)/porting" + EXTRAOBJ=getopt\$o + AC_SUBST(EXTRAOBJ) +fi + ### output makefile and config.h -AC_OUTPUT(makefile,,, cat) +AC_OUTPUT(makefile,[CF_MAKE_DOCS(c_count,1)],, cat) 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/c_count-7.12/makefile.in new/c_count-7.14/makefile.in --- old/c_count-7.12/makefile.in 2010-07-17 13:11:58.000000000 +0200 +++ new/c_count-7.14/makefile.in 2013-10-07 18:43:54.000000000 +0200 @@ -1,4 +1,4 @@ -# $Id: makefile.in,v 7.13 2010/07/17 11:11:58 tom Exp $ +# $Id: makefile.in,v 7.18 2013/10/07 16:43:54 tom Exp $ # Makefile-template for 'c_count' SHELL = /bin/sh @@ -31,6 +31,7 @@ prefix = @prefix@ exec_prefix = @exec_prefix@ +datarootdir = @datarootdir@ bindir = @bindir@ mandir = @mandir@ @@ -44,11 +45,21 @@ #### End of system configuration section. #### +################################################################################ +.SUFFIXES : $o .i + .c$o: @RULE_CC@ @ECHO_CC@$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -OBJ = $(THIS)$o +.c.i : + @RULE_CC@ + @ECHO_CC@$(CPP) -C $(CPPFLAGS) $*.c >$@ + +################################################################################ + +EXTRAOBJ = @EXTRAOBJ@ +OBJ = $(THIS)$o $(EXTRAOBJ) TRANSFORM_BIN = sed 's/$x$$//' |sed '$(transform)'|sed 's/$$/$x/' TRANSFORM_MAN = sed 's/$(manext)$$//'|sed '$(transform)'|sed 's/$$/$(manext)/' @@ -73,16 +84,16 @@ rm -f $(MANDIR)/$(actual_man) mostlyclean: - - rm -f *$o core *~ *.BAK + - rm -f $(OBJ) getopt.c core *~ *.BAK *.i - rm -f Part?? part.* -clean: mostlyclean +clean :: mostlyclean - rm -f $(THIS)$x -distclean: clean +distclean : clean - rm -f makefile config.log config.cache config.status config.h -realclean: distclean +realclean : distclean - rm -f tags TAGS # don't remove configure! check: $(THIS)$x @@ -122,3 +133,6 @@ rm -rf `cat .fname` .fname .files $(THIS)$o: config.h +getopt.c: $(srcdir)/porting/getopt.c + -@ rm -f $@ + cp $? $@ 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/c_count-7.12/package/c_count.nsi new/c_count-7.14/package/c_count.nsi --- old/c_count-7.12/package/c_count.nsi 1970-01-01 01:00:00.000000000 +0100 +++ new/c_count-7.14/package/c_count.nsi 2013-12-14 21:05:33.000000000 +0100 @@ -0,0 +1,101 @@ +; $Id: c_count.nsi,v 1.3 2013/12/14 20:05:33 tom Exp $ +; Script generated with the Venis Install Wizard + +; Define your application name +!define APPNAME "c_count" +!define VERSION_MAJOR "7" +!define VERSION_MINOR "14" +!define VERSION "${VERSION_MAJOR}.${VERSION_MINOR}" +!define APPNAMEANDVERSION "${APPNAME} ${VERSION}" + +; Main Install settings +Name "${APPNAMEANDVERSION}" +InstallDir "\mingw\bin" +InstallDirRegKey HKLM "Software\${APPNAME}" "NSIS install_dir" +OutFile "NSIS-Output\${APPNAME}-${VERSION}-setup.exe" + +; Modern interface settings +!include "MUI.nsh" + +!define MUI_ABORTWARNING + +!insertmacro MUI_PAGE_WELCOME +!insertmacro MUI_PAGE_LICENSE "..\COPYING" +!insertmacro MUI_PAGE_COMPONENTS +!insertmacro MUI_PAGE_DIRECTORY +!insertmacro MUI_PAGE_INSTFILES +!insertmacro MUI_PAGE_FINISH + +!insertmacro MUI_UNPAGE_CONFIRM +!insertmacro MUI_UNPAGE_INSTFILES + +; Set languages (first is default language) +!insertmacro MUI_LANGUAGE "English" +!insertmacro MUI_RESERVEFILE_LANGDLL + +InstType "Full" ; SectionIn 1 +InstType "Typical" ; SectionIn 2 + +Section "C_Count" Section1 + + SectionIn 1 2 + + ; Set Section properties + SetOverwrite on + + ; Set Section Files and Shortcuts + SetOutPath "$INSTDIR\" + File ".\bin\c_count.exe" + CreateDirectory "$SMPROGRAMS\C_Count" + +SectionEnd + +Section "Documentation" Section2 + + SectionIn 1 2 + + ; Set Section properties + SetOverwrite on + + ; Set Section Files and Shortcuts + SetOutPath "$INSTDIR\" + File ".\share\man\man1\c_count.1" + +SectionEnd + +Section -FinishSection + + WriteRegStr HKLM "Software\${APPNAME}" "" "$INSTDIR" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "DisplayName" "${APPNAME}" + WriteRegStr HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" "UninstallString" "$INSTDIR\uninstall.exe" + WriteUninstaller "$INSTDIR\uninstall.exe" + +SectionEnd + +; Modern install component descriptions +!insertmacro MUI_FUNCTION_DESCRIPTION_BEGIN + !insertmacro MUI_DESCRIPTION_TEXT ${Section1} "Program" + !insertmacro MUI_DESCRIPTION_TEXT ${Section2} "Documentation" +!insertmacro MUI_FUNCTION_DESCRIPTION_END + +;Uninstall section +Section Uninstall + + ;Remove from registry... + DeleteRegKey HKLM "Software\Microsoft\Windows\CurrentVersion\Uninstall\${APPNAME}" + DeleteRegKey HKLM "SOFTWARE\${APPNAME}" + + ; Delete self + Delete "$INSTDIR\uninstall.exe" + + ; Clean up program + Delete "$INSTDIR\c_count.exe" + Delete "$INSTDIR\c_count.txt" + + ; Remove remaining directories + RMDir "$SMPROGRAMS\CCount" + RMDir "$INSTDIR\" + +SectionEnd + +; eof \ No newline at end of file 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/c_count-7.12/package/c_count.spec new/c_count-7.14/package/c_count.spec --- old/c_count-7.12/package/c_count.spec 2010-07-17 15:42:54.000000000 +0200 +++ new/c_count-7.14/package/c_count.spec 2013-12-14 21:43:01.000000000 +0100 @@ -1,7 +1,7 @@ Summary: c_count - C-language line counter %define AppProgram c_count -%define AppVersion 7.12 -# $XTermId: c_count.spec,v 1.2 2010/07/17 13:42:54 tom Exp $ +%define AppVersion 7.14 +# $Id: c_count.spec,v 1.5 2013/12/14 20:43:01 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 @@ -9,7 +9,8 @@ Group: Applications/Development URL: ftp://invisible-island.net/%{AppProgram} Source0: %{AppProgram}-%{AppVersion}.tgz -Packager: Thomas Dickey <[email protected]> +Vendor: Thomas E. Dickey +Packager: Thomas E. Dickey <[email protected]> %description C_count counts lines and statements in C-language source files. It 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/c_count-7.12/package/debian/changelog new/c_count-7.14/package/debian/changelog --- old/c_count-7.12/package/debian/changelog 2010-07-17 12:12:19.000000000 +0200 +++ new/c_count-7.14/package/debian/changelog 2013-10-07 17:49:46.000000000 +0200 @@ -1,3 +1,15 @@ +ccount (7.14) unstable; urgency=low + + * routine packaging updates + + -- Thomas E. Dickey <[email protected]> Mon, 07 Oct 2013 11:49:43 -0400 + +ccount (7.13) unstable; urgency=low + + * routine packaging updates + + -- Thomas E. Dickey <[email protected]> Sat, 24 Aug 2013 15:24:56 -0400 + ccount (7.12) unstable; urgency=low * Add package scripts to upstream source, for test-builds. 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/c_count-7.12/package/debian/copyright new/c_count-7.14/package/debian/copyright --- old/c_count-7.12/package/debian/copyright 2010-07-17 12:16:43.000000000 +0200 +++ new/c_count-7.14/package/debian/copyright 2013-10-07 19:20:18.000000000 +0200 @@ -1,7 +1,7 @@ Upstream source http://invisible-island.net/c_count/c_count.html ------------------------------------------------------------------------------- -Copyright 1985-2006,2010 by Thomas E. Dickey. All Rights Reserved. +Copyright 1985-2010,2013 by Thomas E. Dickey. All Rights Reserved. Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, provided @@ -56,7 +56,7 @@ shared with many OS's install programs. Files: debian/* -Copyright: 2010 Thomas E. Dickey +Copyright: 2010,2013 Thomas E. Dickey Licence: other-BSD Permission to use, copy, modify, and distribute this software and its documentation for any purpose and without fee is hereby granted, 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/c_count-7.12/patchlev.h new/c_count-7.14/patchlev.h --- old/c_count-7.12/patchlev.h 2010-07-17 01:27:44.000000000 +0200 +++ new/c_count-7.14/patchlev.h 2013-10-07 17:44:22.000000000 +0200 @@ -1,2 +1,2 @@ #define RELEASE 7 -#define PATCHLEVEL 12 +#define PATCHLEVEL 14 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/c_count-7.12/porting/getopt.c new/c_count-7.14/porting/getopt.c --- old/c_count-7.12/porting/getopt.c 2002-11-22 23:06:46.000000000 +0100 +++ new/c_count-7.14/porting/getopt.c 2013-10-07 18:44:22.000000000 +0200 @@ -1,6 +1,6 @@ /* ::[[ @(#) getopt.c 1.5 89/03/11 05:40:23 ]]:: */ #ifndef LINT -static const char Id[] = "$Id: getopt.c,v 1.2 2002/11/22 22:06:46 tom Exp $"; +static const char Id[] = "$Id: getopt.c,v 1.3 2013/10/07 16:44:22 tom Exp $"; #endif /* @@ -25,6 +25,7 @@ #include <stdio.h> #include <string.h> +#include <getopt.h> #define ERR(szz,czz) if(opterr){fprintf(stderr,"%s%s%c\n",argv[0],szz,czz);} @@ -34,7 +35,7 @@ char *optarg; int -getopt(int argc, char **argv, char *opts) +getopt(int argc, char **argv, const char *opts) { static int sp = 1; register int 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/c_count-7.12/testing/cat.ref new/c_count-7.14/testing/cat.ref --- old/c_count-7.12/testing/cat.ref 2005-07-17 23:45:15.000000000 +0200 +++ new/c_count-7.14/testing/cat.ref 2013-12-14 14:51:11.000000000 +0100 @@ -48,9 +48,9 @@ 0 comment-chars 0.0 % 0 nontext-comment-chars 0.0 % - 172 whitespace-chars 24.8 % + 171 whitespace-chars 24.6 % 83 preprocessor-chars 12.0 % - 439 statement-chars 63.3 % + 440 statement-chars 63.4 % 694 total characters 100.0 % 56 tokens, average length 3.57 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/c_count-7.12/testing/list.ref new/c_count-7.14/testing/list.ref --- old/c_count-7.12/testing/list.ref 2005-07-17 23:45:15.000000000 +0200 +++ new/c_count-7.14/testing/list.ref 2013-12-14 14:51:11.000000000 +0100 @@ -12,9 +12,9 @@ 0 comment-chars 0.0 % 0 nontext-comment-chars 0.0 % - 172 whitespace-chars 24.8 % + 171 whitespace-chars 24.6 % 83 preprocessor-chars 12.0 % - 439 statement-chars 63.3 % + 440 statement-chars 63.4 % 694 total characters 100.0 % 56 tokens, average length 3.57 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/c_count-7.12/testing/normal.ref new/c_count-7.14/testing/normal.ref --- old/c_count-7.12/testing/normal.ref 2005-07-17 23:45:15.000000000 +0200 +++ new/c_count-7.14/testing/normal.ref 2013-12-14 14:51:11.000000000 +0100 @@ -12,9 +12,9 @@ 0 comment-chars 0.0 % 0 nontext-comment-chars 0.0 % - 172 whitespace-chars 24.8 % + 171 whitespace-chars 24.6 % 83 preprocessor-chars 12.0 % - 439 statement-chars 63.3 % + 440 statement-chars 63.4 % 694 total characters 100.0 % 56 tokens, average length 3.57 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
