Hello community, here is the log from the commit of package c_count for openSUSE:Factory checked in at 2014-12-25 23:20:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-06-19 13:20:18.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.c_count.new/c_count.changes 2014-12-25 23:20:26.000000000 +0100 @@ -1,0 +2,9 @@ +Thu Dec 25 13:22:19 UTC 2014 - [email protected] + +- Update to version 7.15 + + ensure that parse-state returns to "code" after a comment is + completed. Extend parsing for numbers to improve error-checking. + + updated configure macros + + update config.guess and config.sub + +------------------------------------------------------------------- Old: ---- c_count-7.14.tgz New: ---- c_count-7.15.tgz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ c_count.spec ++++++ --- /var/tmp/diff_new_pack.WpFR0H/_old 2014-12-25 23:20:27.000000000 +0100 +++ /var/tmp/diff_new_pack.WpFR0H/_new 2014-12-25 23:20:27.000000000 +0100 @@ -18,13 +18,13 @@ Name: c_count -Version: 7.14 +Version: 7.15 Release: 0 Summary: Source Code Measure Counter for C/C++/Java License: MIT Group: Development/Tools/Other Url: http://invisible-island.net/c_count/ -Source: ftp://invisible-island.net/c_count/c_count-%{version}.tgz +Source: ftp://invisible-island.net/c_count/%{name}-%{version}.tgz BuildRequires: autoconf BuildRequires: automake BuildRequires: gcc ++++++ c_count-7.14.tgz -> c_count-7.15.tgz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/CHANGES new/c_count-7.15/CHANGES --- old/c_count-7.14/CHANGES 2013-12-14 16:56:54.000000000 +0100 +++ new/c_count-7.15/CHANGES 2014-09-22 21:59:25.000000000 +0200 @@ -1,4 +1,12 @@ --- $Id: CHANGES,v 7.27 2013/12/14 15:56:54 tom Exp $ +-- $Id: CHANGES,v 7.29 2014/09/22 19:59:25 tom Exp $ + +2014/09/22 (c_count 7.15) + + ensure that parse-state returns to "code" after a comment is + completed. Extend parsing for numbers to improve error-checking. + + + updated configure macros + + + update config.guess and config.sub 2013/12/14 (c_count 7.14) + add script for cross-compiling NullSoft installer to MinGW. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/COPYING new/c_count-7.15/COPYING --- old/c_count-7.14/COPYING 2013-08-24 21:14:26.000000000 +0200 +++ new/c_count-7.15/COPYING 2014-09-22 22:03:24.000000000 +0200 @@ -1,10 +1,10 @@ -$Id: COPYING,v 7.9 2013/08/24 19:14:26 tom Exp $ +$Id: COPYING,v 7.10 2014/09/22 20:03:24 tom Exp $ C_COUNT -------------------------------------------------------------------------------- -Copyright 1985-2010,2013 by Thomas E. Dickey +Copyright 1985-2013,2014 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' old/c_count-7.14/MANIFEST new/c_count-7.15/MANIFEST --- old/c_count-7.14/MANIFEST 2013-12-14 21:55:07.000000000 +0100 +++ new/c_count-7.15/MANIFEST 2013-12-15 21:59:24.000000000 +0100 @@ -1,4 +1,4 @@ -MANIFEST for c_count-7.14, version v7_14 +MANIFEST for c_count-7.15, version v7_15 -------------------------------------------------------------------------------- MANIFEST this file CHANGES extracted change-log from c_count.c diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/aclocal.m4 new/c_count-7.15/aclocal.m4 --- old/c_count-7.14/aclocal.m4 2013-12-14 16:45:58.000000000 +0100 +++ new/c_count-7.15/aclocal.m4 2014-09-22 22:02:10.000000000 +0200 @@ -1,11 +1,11 @@ -dnl $Id: aclocal.m4,v 7.12 2013/12/14 15:45:58 tom Exp $ +dnl $Id: aclocal.m4,v 7.13 2014/09/22 20:02:10 tom Exp $ dnl Process this file with autoconf to produce a configure script. dnl dnl See also dnl http://invisible-island.net/autoconf/ dnl --------------------------------------------------------------------------- dnl --------------------------------------------------------------------------- -dnl CF_ADD_CFLAGS version: 10 updated: 2010/05/26 05:38:42 +dnl CF_ADD_CFLAGS version: 11 updated: 2014/07/22 05:32:57 dnl ------------- dnl Copy non-preprocessor flags to $CFLAGS, preprocessor flags to $CPPFLAGS dnl The second parameter if given makes this macro verbose. @@ -30,7 +30,7 @@ -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[[^=]]*='\''\"[[^"]]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -67,7 +67,7 @@ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[[^"]]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -619,7 +619,7 @@ AC_SUBST(EXTRA_CFLAGS) ])dnl dnl --------------------------------------------------------------------------- -dnl CF_GETOPT_HEADER version: 5 updated: 2012/10/06 16:39:58 +dnl CF_GETOPT_HEADER version: 6 updated: 2014/07/22 14:45:54 dnl ---------------- dnl Check for getopt's variables which are commonly defined in stdlib.h, dnl unistd.h or (nonstandard) in getopt.h @@ -638,11 +638,14 @@ done ]) if test $cf_cv_getopt_header != none ; then - AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if we need to include getopt.h]) + AC_DEFINE(HAVE_GETOPT_HEADER,1,[Define to 1 if getopt variables are declared in header]) +fi +if test $cf_cv_getopt_header = getopt.h ; then + AC_DEFINE(NEED_GETOPT_H,1,[Define to 1 if we must include getopt.h]) fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_INTEL_COMPILER version: 5 updated: 2013/02/10 10:41:05 +dnl CF_INTEL_COMPILER version: 6 updated: 2014/03/17 13:13:07 dnl ----------------- dnl Check if the given compiler is really the Intel compiler for Linux. It dnl tries to imitate gcc, but does not return an error when it finds a mismatch @@ -671,7 +674,7 @@ make an error #endif ],[ifelse([$2],,INTEL_COMPILER,[$2])=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" ],[]) ifelse([$3],,CFLAGS,[$3])="$cf_save_CFLAGS" AC_MSG_RESULT($ifelse([$2],,INTEL_COMPILER,[$2])) @@ -680,7 +683,7 @@ fi ])dnl dnl --------------------------------------------------------------------------- -dnl CF_MAKE_DOCS version: 2 updated: 2013/01/02 20:04:08 +dnl CF_MAKE_DOCS version: 3 updated: 2014/01/05 13:21:25 dnl ------------ dnl $1 = name(s) to generate rules for dnl $2 = suffix of corresponding manpages used as input. @@ -726,10 +729,10 @@ docs-clean :: rm -f $cf_name.html $cf_name.pdf $cf_name.ps $cf_name.txt -$cf_name.html : $cf_name.$2 +$cf_name.html : $cf_name.\$2 $cf_name.pdf : $cf_name.ps -$cf_name.ps : $cf_name.$2 -$cf_name.txt : $cf_name.$2 +$cf_name.ps : $cf_name.\$2 +$cf_name.txt : $cf_name.\$2 CF_EOF done ])dnl diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/c_count.c new/c_count-7.15/c_count.c --- old/c_count-7.14/c_count.c 2013-12-14 14:45:23.000000000 +0100 +++ new/c_count-7.15/c_count.c 2013-12-16 02:36:13.000000000 +0100 @@ -3,6 +3,9 @@ * Author: T.E.Dickey * Created: 04 Dec 1985 * Modified: + * 15 Dec 2013, ensure that parse-state returns to "code" after a + * comment is completed. Extend parsing for numbers + * to improve error-checking. * 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. @@ -98,7 +101,7 @@ #include "patchlev.h" #ifndef NO_IDENT -static const char Id[] = "$Id: c_count.c,v 7.59 2013/12/14 13:45:23 tom Exp $"; +static const char Id[] = "$Id: c_count.c,v 7.62 2013/12/16 01:36:13 tom Exp $"; #endif #include <stdio.h> @@ -234,12 +237,21 @@ static STATS Old; /* previous data for summarize() */ -enum PSTATE { +typedef enum { + tNone = 0, + tChar, + tNumber, + tToken +} TSTATE; +typedef enum { pCode, pComment, + pCppComment, pPreprocessor -}; -static enum PSTATE pstate; +} PSTATE; +static PSTATE pstate; + +#define IsComment(s) ((s) == pComment || (s) == pCppComment) static int within_stmt; /* nonzero within statements */ @@ -582,6 +594,20 @@ return c; } +static int +guessToken(int c) +{ + int result; + if (TOKEN(c)) { + result = tToken; + } else if (NUMBER(c)) { + result = tNumber; + } else { + result = tChar; + } + return result; +} + /* * If '-q' option is in effect, append to the token-buffer until a token is * complete. Test the completed token to see if it matches any of the strings @@ -601,60 +627,151 @@ static char *bfr; static size_t used = 0; static size_t have = 0; + static TSTATE tstate = tNone; + static char exponents[] = "eE"; + static char suffixes[] = "uUlL"; - enum PSTATE bstate = pstate; + PSTATE bstate = pstate; int j = 0; if (bfr == 0) bfr = malloc(have = 80); - if (TOKEN(c)) { - int word_length = 0; - One.words_total++; - do { - if (used + 2 >= have) - bfr = realloc(bfr, have *= 2); - bfr[used++] = (char) c; - word_length++; - c = inFile(); - } while (TOKEN2(c)); - bfr[used] = EOS; + if (tstate == tNone) { + tstate = guessToken(c); + } - DEBUG("name\t%s\n", bfr); + switch (tstate) { + case tToken: + { + int word_length = 0; + One.words_total++; + do { + if (used + 2 >= have) + bfr = realloc(bfr, have *= 2); + bfr[used++] = (char) c; + word_length++; + c = inFile(); + } while (TOKEN2(c)); + bfr[used] = EOS; - One.words_length += word_length; - if (word_length >= limit_name) - One.flags_2long++; - - if (pstate == pPreprocessor && !strcmp(bfr, "include")) { - c = IncludeFile(c); - } else if (quotdef) { - if (c == ' ' || c == '\t' || c == '(') { - for (j = 0; j < quotdef; j++) { - if (!strcmp(quotvec[j], bfr)) { - c = Quoted('"'); - DEBUG("**%c**\n", c); - break; + DEBUG("name\t%s\n", bfr); + + One.words_length += word_length; + if (word_length >= limit_name) + One.flags_2long++; + + if (pstate == pPreprocessor && !strcmp(bfr, "include")) { + c = IncludeFile(c); + } else if (quotdef) { + if (c == ' ' || c == '\t' || c == '(') { + for (j = 0; j < quotdef; j++) { + if (!strcmp(quotvec[j], bfr)) { + c = Quoted('"'); + DEBUG("**%c**\n", c); + break; + } } } } } - } else if (NUMBER(c)) { - do { - if (used + 2 >= have) - bfr = realloc(bfr, have *= 2); - bfr[used++] = (char) c; - c = inFile(); - } while (NUMBER2(c)); - bfr[used] = EOS; + break; + case tNumber: + { + int digits = 0; + int lead_0 = 0; + int baseis = 0; + int gotdot = 0; + int gotexp = 0; + int gotend = 0; + + used = 0; + if (isdigit(c)) { + ++digits; + } else if (c == '.') { + gotdot = 1; + } + if (c == '0') { + lead_0 = 1; + } + + for (;;) { + if (used + 4 >= have) + bfr = realloc(bfr, have = (2 * (used + 2))); + bfr[used++] = (char) c; + c = inFile(); + if (c <= 0) { + break; + } else if (gotend) { + if ((strchr) (suffixes, c) == 0) { + break; + } + } else if (gotdot || (baseis == 0 && digits && !isdigit(c) + && (strchr) (exponents, c) != 0)) { + if (gotexp == 1) { + if (c == '+' || c == '-' || isdigit(c)) { + gotexp = 2; + } else { + break; + } + } else if (gotexp == 2) { + if ((strchr) (suffixes, c)) { + gotexp = 3; + } else if (!isdigit(c)) { + break; + } + } else if (gotexp == 3) { + if ((strchr) (suffixes, c) == 0) { + break; + } + } else if ((strchr) (exponents, c) != 0) { + gotdot = 1; + gotexp = 1; + } else if (isdigit(c)) { + ++digits; + } else { + break; + } + } else if (c == '.') { + gotdot = 1; + } else if (lead_0 && used == 1) { + if (c == 'x' || c == 'X') { + baseis = 16; + } else if (isoctal(c)) { + baseis = 8; + } else { + break; + } + } else if ((strchr) (suffixes, c) != 0) { + if (digits) { + gotend = 1; + } else { + break; + } + } else if (baseis == 16 && isxdigit(c)) { + ++digits; + } else if (baseis == 8 && isoctal(c)) { + ++digits; + } else if (isdigit(c)) { + ++digits; + } else { + break; + } + } + bfr[used] = EOS; - DEBUG("number\t%s\n", bfr); - } else { /* punctuation */ + DEBUG("number\t%s\n", bfr); + } + break; + case tNone: + /* FALLTHRU */ + case tChar: /* punctuation */ if (debug) { if (isgraph(c) && strchr("{};/\\", c) == 0) DEBUG("char\t%c\n", c); } c = inFile(); + break; } used = 0; @@ -668,6 +785,7 @@ have = 0; } #endif + tstate = tNone; return (c); } @@ -681,7 +799,7 @@ static int had_note; static int had_code; static int cnt_code; - static enum PSTATE bstate; + static PSTATE bstate; if (ch < 0) { within_stmt = 0; @@ -731,8 +849,8 @@ pstate = pPreprocessor; } else if (ch == '\n') { if (cnt_code) { - had_code += (pstate != pComment); - if (pstate == pComment) + had_code += !IsComment(pstate); + if (IsComment(pstate)) had_note = TRUE; cnt_code = 0; } @@ -740,8 +858,13 @@ if (is_blank) { One.lines_blank++; } else { - if (pstate == pPreprocessor - || bstate == pPreprocessor) { + if (pstate == pCppComment + && bstate == pPreprocessor) { + One.lines_prepro++; + One.lines_inline++; + pstate = pPreprocessor; + } else if (pstate == pPreprocessor + || bstate == pPreprocessor) { One.lines_prepro++; if (had_note) { One.lines_inline++; @@ -751,7 +874,7 @@ if (had_note) { One.lines_inline++; } - } else if (had_note || pstate == pComment) { + } else if (had_note || IsComment(pstate)) { One.lines_notes++; } had_code = @@ -783,6 +906,8 @@ is_blank = FALSE; switch (pstate) { case pComment: + /* FALLTHRU */ + case pCppComment: if (cnt_code) { had_code += (cnt_code > 2); cnt_code = 0; @@ -857,12 +982,14 @@ switch (c) { case '/': c = Token(EOS); - if (c == '*') + if (c == '*') { c = Comment(FALSE); - else if (c == '/') + } else if (c == '/') { c = Comment(TRUE); - else + pstate = pCode; + } else { DEBUG("char\t%c\n", c); + } break; case '"': case '\'': @@ -1081,15 +1208,15 @@ static int filter_history(int first) { - enum HSTATE { + typedef enum { unknown, cms, rlog, revision, contents - }; + } HSTATE; static const char *CMS_ = "DEC/CMS REPLACEMENT HISTORY,"; - static enum HSTATE hstate = unknown; + static HSTATE hstate = unknown; static char buffer[BUFSIZ]; static char prefix[BUFSIZ]; static size_t len; @@ -1173,7 +1300,7 @@ { int c; int d = 0; - enum PSTATE save_st = pstate; + PSTATE save_st = pstate; if (within_stmt == 2) { One.stmts_total--; @@ -1188,7 +1315,9 @@ } One.chars_ignore += 2; /* ignore the comment-delimiter */ - pstate = pComment; + pstate = (c_plus_plus + ? pCppComment + : pComment); c = filter_history(TRUE); while (c != EOF) { if (c_plus_plus) { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/config.guess new/c_count-7.15/config.guess --- old/c_count-7.14/config.guess 2013-09-07 20:15:42.000000000 +0200 +++ new/c_count-7.15/config.guess 2014-04-19 20:29:33.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Attempt to guess a canonical system name. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-06-10' +timestamp='2014-03-23' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -50,7 +50,7 @@ GNU config.guess ($timestamp) Originally written by Per Bothner. -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -149,7 +149,7 @@ LIBC=gnu #endif EOF - eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC'` + eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^LIBC' | sed 's, ,,g'` ;; esac @@ -826,7 +826,7 @@ *:MINGW*:*) echo ${UNAME_MACHINE}-pc-mingw32 exit ;; - i*:MSYS*:*) + *:MSYS*:*) echo ${UNAME_MACHINE}-pc-msys exit ;; i*:windows32*:*) @@ -969,10 +969,10 @@ eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep '^CPU'` test x"${CPU}" != x && { echo "${CPU}-unknown-linux-${LIBC}"; exit; } ;; - or1k:Linux:*:*) - echo ${UNAME_MACHINE}-unknown-linux-${LIBC} + openrisc*:Linux:*:*) + echo or1k-unknown-linux-${LIBC} exit ;; - or32:Linux:*:*) + or32:Linux:*:* | or1k*:Linux:*:*) echo ${UNAME_MACHINE}-unknown-linux-${LIBC} exit ;; padre:Linux:*:*) @@ -1260,16 +1260,26 @@ if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi - if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then - if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ - (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ - grep IS_64BIT_ARCH >/dev/null - then - case $UNAME_PROCESSOR in - i386) UNAME_PROCESSOR=x86_64 ;; - powerpc) UNAME_PROCESSOR=powerpc64 ;; - esac + if test `echo "$UNAME_RELEASE" | sed -e 's/\..*//'` -le 10 ; then + if [ "$CC_FOR_BUILD" != 'no_compiler_found' ]; then + if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ + (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) | \ + grep IS_64BIT_ARCH >/dev/null + then + case $UNAME_PROCESSOR in + i386) UNAME_PROCESSOR=x86_64 ;; + powerpc) UNAME_PROCESSOR=powerpc64 ;; + esac + fi fi + elif test "$UNAME_PROCESSOR" = i386 ; then + # Avoid executing cc on OS X 10.9, as it ships with a stub + # that puts up a graphical alert prompting to install + # developer tools. Any system running Mac OS X 10.7 or + # later (Darwin 11 and later) is required to have a 64-bit + # processor. This is not true of the ARM version of Darwin + # that Apple uses in portable devices. + UNAME_PROCESSOR=x86_64 fi echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE} exit ;; @@ -1361,154 +1371,6 @@ exit ;; esac -eval $set_cc_for_build -cat >$dummy.c <<EOF -#ifdef _SEQUENT_ -# include <sys/types.h> -# include <sys/utsname.h> -#endif -main () -{ -#if defined (sony) -#if defined (MIPSEB) - /* BFD wants "bsd" instead of "newsos". Perhaps BFD should be changed, - I don't know.... */ - printf ("mips-sony-bsd\n"); exit (0); -#else -#include <sys/param.h> - printf ("m68k-sony-newsos%s\n", -#ifdef NEWSOS4 - "4" -#else - "" -#endif - ); exit (0); -#endif -#endif - -#if defined (__arm) && defined (__acorn) && defined (__unix) - printf ("arm-acorn-riscix\n"); exit (0); -#endif - -#if defined (hp300) && !defined (hpux) - printf ("m68k-hp-bsd\n"); exit (0); -#endif - -#if defined (NeXT) -#if !defined (__ARCHITECTURE__) -#define __ARCHITECTURE__ "m68k" -#endif - int version; - version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`; - if (version < 4) - printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version); - else - printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version); - exit (0); -#endif - -#if defined (MULTIMAX) || defined (n16) -#if defined (UMAXV) - printf ("ns32k-encore-sysv\n"); exit (0); -#else -#if defined (CMU) - printf ("ns32k-encore-mach\n"); exit (0); -#else - printf ("ns32k-encore-bsd\n"); exit (0); -#endif -#endif -#endif - -#if defined (__386BSD__) - printf ("i386-pc-bsd\n"); exit (0); -#endif - -#if defined (sequent) -#if defined (i386) - printf ("i386-sequent-dynix\n"); exit (0); -#endif -#if defined (ns32000) - printf ("ns32k-sequent-dynix\n"); exit (0); -#endif -#endif - -#if defined (_SEQUENT_) - struct utsname un; - - uname(&un); - - if (strncmp(un.version, "V2", 2) == 0) { - printf ("i386-sequent-ptx2\n"); exit (0); - } - if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */ - printf ("i386-sequent-ptx1\n"); exit (0); - } - printf ("i386-sequent-ptx\n"); exit (0); - -#endif - -#if defined (vax) -# if !defined (ultrix) -# include <sys/param.h> -# if defined (BSD) -# if BSD == 43 - printf ("vax-dec-bsd4.3\n"); exit (0); -# else -# if BSD == 199006 - printf ("vax-dec-bsd4.3reno\n"); exit (0); -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# endif -# else - printf ("vax-dec-bsd\n"); exit (0); -# endif -# else - printf ("vax-dec-ultrix\n"); exit (0); -# endif -#endif - -#if defined (alliant) && defined (i860) - printf ("i860-alliant-bsd\n"); exit (0); -#endif - - exit (1); -} -EOF - -$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` && - { echo "$SYSTEM_NAME"; exit; } - -# Apollos put the system type in the environment. - -test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; } - -# Convex versions that predate uname can use getsysinfo(1) - -if [ -x /usr/convex/getsysinfo ] -then - case `getsysinfo -f cpu_type` in - c1*) - echo c1-convex-bsd - exit ;; - c2*) - if getsysinfo -f scalar_acc - then echo c32-convex-bsd - else echo c2-convex-bsd - fi - exit ;; - c34*) - echo c34-convex-bsd - exit ;; - c38*) - echo c38-convex-bsd - exit ;; - c4*) - echo c4-convex-bsd - exit ;; - esac -fi - cat >&2 <<EOF $0: unable to guess system type diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/config.sub new/c_count-7.15/config.sub --- old/c_count-7.14/config.sub 2013-10-25 10:00:00.000000000 +0200 +++ new/c_count-7.15/config.sub 2014-09-01 18:17:56.000000000 +0200 @@ -1,8 +1,8 @@ #! /bin/sh # Configuration validation subroutine script. -# Copyright 1992-2013 Free Software Foundation, Inc. +# Copyright 1992-2014 Free Software Foundation, Inc. -timestamp='2013-10-01' +timestamp='2014-07-28' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by @@ -68,7 +68,7 @@ version="\ GNU config.sub ($timestamp) -Copyright 1992-2013 Free Software Foundation, Inc. +Copyright 1992-2014 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." @@ -283,8 +283,10 @@ | mips64vr5900 | mips64vr5900el \ | mipsisa32 | mipsisa32el \ | mipsisa32r2 | mipsisa32r2el \ + | mipsisa32r6 | mipsisa32r6el \ | mipsisa64 | mipsisa64el \ | mipsisa64r2 | mipsisa64r2el \ + | mipsisa64r6 | mipsisa64r6el \ | mipsisa64sb1 | mipsisa64sb1el \ | mipsisa64sr71k | mipsisa64sr71kel \ | mipsr5900 | mipsr5900el \ @@ -296,8 +298,7 @@ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ - | open8 \ - | or1k | or32 \ + | open8 | or1k | or1knd | or32 \ | pdp10 | pdp11 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pyramid \ @@ -402,8 +403,10 @@ | mips64vr5900-* | mips64vr5900el-* \ | mipsisa32-* | mipsisa32el-* \ | mipsisa32r2-* | mipsisa32r2el-* \ + | mipsisa32r6-* | mipsisa32r6el-* \ | mipsisa64-* | mipsisa64el-* \ | mipsisa64r2-* | mipsisa64r2el-* \ + | mipsisa64r6-* | mipsisa64r6el-* \ | mipsisa64sb1-* | mipsisa64sb1el-* \ | mipsisa64sr71k-* | mipsisa64sr71kel-* \ | mipsr5900-* | mipsr5900el-* \ @@ -415,6 +418,7 @@ | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ + | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ @@ -824,6 +828,10 @@ basic_machine=powerpc-unknown os=-morphos ;; + moxiebox) + basic_machine=moxie-unknown + os=-moxiebox + ;; msdos) basic_machine=i386-pc os=-msdos @@ -1369,14 +1377,14 @@ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ - | -uxpv* | -beos* | -mpeix* | -udk* \ + | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ - | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es*) + | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* | -tirtos*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) @@ -1594,9 +1602,6 @@ mips*-*) os=-elf ;; - or1k-*) - os=-elf - ;; or32-*) os=-coff ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/configure new/c_count-7.15/configure --- old/c_count-7.14/configure 2013-12-14 16:46:05.000000000 +0100 +++ new/c_count-7.15/configure 2014-09-22 22:02:39.000000000 +0200 @@ -2161,7 +2161,7 @@ -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2202,7 +2202,7 @@ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2271,7 +2271,7 @@ -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2312,7 +2312,7 @@ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2399,7 +2399,7 @@ -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -2440,7 +2440,7 @@ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -2876,7 +2876,7 @@ echo "$as_me:2876: \$? = $ac_status" >&5 (exit $ac_status); }; }; then INTEL_COMPILER=yes -cf_save_CFLAGS="$cf_save_CFLAGS -we147 -no-gcc" +cf_save_CFLAGS="$cf_save_CFLAGS -we147" else echo "$as_me: failed program was:" >&5 @@ -3352,7 +3352,7 @@ -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -3393,7 +3393,7 @@ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -3564,7 +3564,7 @@ -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -3605,7 +3605,7 @@ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -3776,7 +3776,7 @@ -D*) cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^-D[^=]*='\''\"[^"]*//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=yes @@ -3817,7 +3817,7 @@ cf_tst_cflags=`echo ${cf_add_cflags} |sed -e 's/^[^"]*"'\''//'` - test "${cf_add_cflags}" != "${cf_tst_cflags}" \ + test "x${cf_add_cflags}" != "x${cf_tst_cflags}" \ && test -z "${cf_tst_cflags}" \ && cf_fix_cppflags=no ;; @@ -4225,6 +4225,13 @@ EOF fi +if test $cf_cv_getopt_header = getopt.h ; then + +cat >>confdefs.h <<\EOF +#define NEED_GETOPT_H 1 +EOF + +fi if test $ac_cv_func_getopt = 'no' then @@ -4315,7 +4322,7 @@ : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files ac_clean_files="$ac_clean_files $CONFIG_STATUS" -{ echo "$as_me:4318: creating $CONFIG_STATUS" >&5 +{ echo "$as_me:4325: creating $CONFIG_STATUS" >&5 echo "$as_me: creating $CONFIG_STATUS" >&6;} cat >$CONFIG_STATUS <<_ACEOF #! $SHELL @@ -4491,7 +4498,7 @@ echo "$ac_cs_version"; exit 0 ;; --he | --h) # Conflict between --help and --header - { { echo "$as_me:4494: error: ambiguous option: $1 + { { echo "$as_me:4501: error: ambiguous option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: ambiguous option: $1 Try \`$0 --help' for more information." >&2;} @@ -4510,7 +4517,7 @@ ac_need_defaults=false;; # This is an error. - -*) { { echo "$as_me:4513: error: unrecognized option: $1 + -*) { { echo "$as_me:4520: error: unrecognized option: $1 Try \`$0 --help' for more information." >&5 echo "$as_me: error: unrecognized option: $1 Try \`$0 --help' for more information." >&2;} @@ -4548,7 +4555,7 @@ "makefile" ) CONFIG_FILES="$CONFIG_FILES makefile" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.hin" ;; - *) { { echo "$as_me:4551: error: invalid argument: $ac_config_target" >&5 + *) { { echo "$as_me:4558: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} { (exit 1); exit 1; }; };; esac @@ -4784,7 +4791,7 @@ esac if test x"$ac_file" != x-; then - { echo "$as_me:4787: creating $ac_file" >&5 + { echo "$as_me:4794: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} rm -f "$ac_file" fi @@ -4802,7 +4809,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4805: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4812: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4815,7 +4822,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4818: error: cannot find input file: $f" >&5 + { { echo "$as_me:4825: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -4831,7 +4838,7 @@ if test -n "$ac_seen"; then ac_used=`grep '@datarootdir@' $ac_item` if test -z "$ac_used"; then - { echo "$as_me:4834: WARNING: datarootdir was used implicitly but not set: + { echo "$as_me:4841: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used implicitly but not set: $ac_seen" >&2;} @@ -4840,7 +4847,7 @@ fi ac_seen=`grep '${datarootdir}' $ac_item` if test -n "$ac_seen"; then - { echo "$as_me:4843: WARNING: datarootdir was used explicitly but not set: + { echo "$as_me:4850: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&5 echo "$as_me: WARNING: datarootdir was used explicitly but not set: $ac_seen" >&2;} @@ -4877,7 +4884,7 @@ ac_init=`egrep '[ ]*'$ac_name'[ ]*=' $ac_file` if test -z "$ac_init"; then ac_seen=`echo "$ac_seen" |sed -e 's,^,'$ac_file':,'` - { echo "$as_me:4880: WARNING: Variable $ac_name is used but was not set: + { echo "$as_me:4887: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&5 echo "$as_me: WARNING: Variable $ac_name is used but was not set: $ac_seen" >&2;} @@ -4888,7 +4895,7 @@ egrep -n '@[A-Z_][A-Z_0-9]+@' $ac_file >>$tmp/out if test -s $tmp/out; then ac_seen=`sed -e 's,^,'$ac_file':,' < $tmp/out` - { echo "$as_me:4891: WARNING: Some variables may not be substituted: + { echo "$as_me:4898: WARNING: Some variables may not be substituted: $ac_seen" >&5 echo "$as_me: WARNING: Some variables may not be substituted: $ac_seen" >&2;} @@ -4937,7 +4944,7 @@ * ) ac_file_in=$ac_file.in ;; esac - test x"$ac_file" != x- && { echo "$as_me:4940: creating $ac_file" >&5 + test x"$ac_file" != x- && { echo "$as_me:4947: creating $ac_file" >&5 echo "$as_me: creating $ac_file" >&6;} # First look for the input files in the build tree, otherwise in the @@ -4948,7 +4955,7 @@ -) echo $tmp/stdin ;; [\\/$]*) # Absolute (can't be DOS-style, as IFS=:) - test -f "$f" || { { echo "$as_me:4951: error: cannot find input file: $f" >&5 + test -f "$f" || { { echo "$as_me:4958: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } echo $f;; @@ -4961,7 +4968,7 @@ echo $srcdir/$f else # /dev/null tree - { { echo "$as_me:4964: error: cannot find input file: $f" >&5 + { { echo "$as_me:4971: error: cannot find input file: $f" >&5 echo "$as_me: error: cannot find input file: $f" >&2;} { (exit 1); exit 1; }; } fi;; @@ -5019,7 +5026,7 @@ rm -f $tmp/in if test x"$ac_file" != x-; then if cmp -s $ac_file $tmp/config.h 2>/dev/null; then - { echo "$as_me:5022: $ac_file is unchanged" >&5 + { echo "$as_me:5029: $ac_file is unchanged" >&5 echo "$as_me: $ac_file is unchanged" >&6;} else ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \ @@ -5111,10 +5118,10 @@ docs-clean :: rm -f $cf_name.html $cf_name.pdf $cf_name.ps $cf_name.txt -$cf_name.html : $cf_name.1 +$cf_name.html : $cf_name.\1 $cf_name.pdf : $cf_name.ps -$cf_name.ps : $cf_name.1 -$cf_name.txt : $cf_name.1 +$cf_name.ps : $cf_name.\1 +$cf_name.txt : $cf_name.\1 CF_EOF done ;; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/package/c_count.spec new/c_count-7.15/package/c_count.spec --- old/c_count-7.14/package/c_count.spec 2013-12-14 21:43:01.000000000 +0100 +++ new/c_count-7.15/package/c_count.spec 2013-12-15 21:59:41.000000000 +0100 @@ -1,7 +1,7 @@ Summary: c_count - C-language line counter %define AppProgram c_count -%define AppVersion 7.14 -# $Id: c_count.spec,v 1.5 2013/12/14 20:43:01 tom Exp $ +%define AppVersion 7.15 +# $Id: c_count.spec,v 1.6 2013/12/15 20:59:41 tom Exp $ Name: %{AppProgram} Version: %{AppVersion} Release: 1 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/package/debian/changelog new/c_count-7.15/package/debian/changelog --- old/c_count-7.14/package/debian/changelog 2013-10-07 17:49:46.000000000 +0200 +++ new/c_count-7.15/package/debian/changelog 2013-12-15 22:00:19.000000000 +0100 @@ -1,3 +1,9 @@ +ccount (7.15) unstable; urgency=low + + * errata found comparing with lex-metrics + + -- Thomas E. Dickey <[email protected]> Sun, 15 Dec 2013 16:00:17 -0500 + ccount (7.14) unstable; urgency=low * routine packaging updates diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/c_count-7.14/package/debian/copyright new/c_count-7.15/package/debian/copyright --- old/c_count-7.14/package/debian/copyright 2013-10-07 19:20:18.000000000 +0200 +++ new/c_count-7.15/package/debian/copyright 2014-09-22 22:03:51.000000000 +0200 @@ -1,7 +1,7 @@ Upstream source http://invisible-island.net/c_count/c_count.html ------------------------------------------------------------------------------- -Copyright 1985-2010,2013 by Thomas E. Dickey. All Rights Reserved. +Copyright 1985-2013,2014 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,2013 Thomas E. Dickey +Copyright: 2010-2013,2014 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' old/c_count-7.14/patchlev.h new/c_count-7.15/patchlev.h --- old/c_count-7.14/patchlev.h 2013-10-07 17:44:22.000000000 +0200 +++ new/c_count-7.15/patchlev.h 2013-12-15 22:00:59.000000000 +0100 @@ -1,2 +1,2 @@ #define RELEASE 7 -#define PATCHLEVEL 14 +#define PATCHLEVEL 15 -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
