Hello community, here is the log from the commit of package hxtools for openSUSE:Factory checked in at 2014-04-02 17:22:49 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/hxtools (Old) and /work/SRC/openSUSE:Factory/.hxtools.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "hxtools" Changes: -------- --- /work/SRC/openSUSE:Factory/hxtools/hxtools.changes 2014-02-13 15:01:25.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.hxtools.new/hxtools.changes 2014-04-02 17:22:54.000000000 +0200 @@ -1,0 +2,8 @@ +Tue Mar 25 18:41:41 UTC 2014 - jengelh@inai.de + +- Update to new upstream release 20140325 +* bin2c now supports the -p option to strip paths +* bin2c also defaults to stripping all leading paths +- Drop support for old distros in .spec file + +------------------------------------------------------------------- Old: ---- hxtools-20131222.tar.asc hxtools-20131222.tar.xz New: ---- hxtools-20140325.tar.asc hxtools-20140325.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ hxtools.spec ++++++ --- /var/tmp/diff_new_pack.uO7S7z/_old 2014-04-02 17:22:55.000000000 +0200 +++ /var/tmp/diff_new_pack.uO7S7z/_new 2014-04-02 17:22:55.000000000 +0200 @@ -17,7 +17,7 @@ Name: hxtools -Version: 20131222 +Version: 20140325 Release: 0 Summary: Collection of day-to-day tools (binaries) License: GPL-2.0+ and WTFPL @@ -31,36 +31,17 @@ # See https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines BuildRequires: fdupes BuildRequires: libcap-devel >= 2 -# xorg-x11 for "bdftopcf" -%if 0%{?suse_version} >= 1220 || 0%{?rhel_version} || 0%{?fedora_version} BuildRequires: bdftopcf -%else -BuildRequires: xorg-x11 -%endif BuildRequires: pkgconfig >= 0.21 BuildRequires: xz -%if 0%{?suse_version} >= 1230 -BuildRequires: gpg-offline -%endif -%if 0%{?suse_version} >= 1130 -BuildRequires: pkgconfig(libHX) >= 3.12 +BuildRequires: pkgconfig(libHX) >= 3.17 BuildRequires: pkgconfig(libpci) >= 3 BuildRequires: pkgconfig(mount) >= 2.20 BuildRequires: pkgconfig(xcb) >= 1 -%else -BuildRequires: libHX-devel >= 3.12 -BuildRequires: libmount-devel >= 2.20 -BuildRequires: libxcb-devel >= 1 -BuildRequires: pciutils-devel >= 3 -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: %name-scripts = %version -%if 0%{?suse_version} >= 1100 Recommends: %name-man = %version -%else -Requires: %name-man = %version -%endif Requires: fd0ssh Requires: ofl Requires: sysinfo = %version @@ -82,15 +63,9 @@ %package scripts Summary: Collection of day-to-day tools (scripts) Group: Productivity/Other -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif Requires: %name -%if 0%{?suse_version} >= 1100 Recommends: %name-man -%else -Requires: %name-man -%endif Requires: perl(Data::Dumper) Requires: perl(File::Find) Requires: perl(File::Find::Rule) @@ -124,9 +99,7 @@ %package man Summary: Manual pages for the hxtools suite Group: Documentation/Man -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description man This package contains the manual pages for the binaries and scripts @@ -135,9 +108,7 @@ %package data Summary: Collection of day-to-day tools (data) Group: Productivity/Other -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description data Architecture-independent data from hxtools. @@ -152,9 +123,7 @@ Requires: %name = %version Requires: %name-data = %version Requires: %name-scripts = %version -%if 0%{?suse_version} >= 1120 BuildArch: noarch -%endif %description profile Bash environment settings from hxtools. Particularly, this provides @@ -192,14 +161,7 @@ an entire mount. %prep -xz -dk "%{S:0}" -%{?gpg_verify: %gpg_verify %{S:2}} -%if 0%{?__xz:1} %setup -q -%else -tar -xf "%{S:0}" --use=xz; -%setup -DTq -%endif %build %configure ++++++ hxtools-20131222.tar.xz -> hxtools-20140325.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/Makefile.in new/hxtools-20140325/Makefile.in --- old/hxtools-20131222/Makefile.in 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -214,9 +214,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ @@ -346,8 +343,8 @@ $(am__aclocal_m4_deps): config.h: stamp-h1 - @if test ! -f $@; then rm -f stamp-h1; else :; fi - @if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi + @test -f $@ || rm -f stamp-h1 + @test -f $@ || $(MAKE) $(AM_MAKEFLAGS) stamp-h1 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status @rm -f stamp-h1 @@ -546,10 +543,16 @@ $(am__post_remove_distdir) dist-tarZ: distdir + @echo WARNING: "Support for shar distribution archives is" \ + "deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 tardir=$(distdir) && $(am__tar) | compress -c >$(distdir).tar.Z $(am__post_remove_distdir) dist-shar: distdir + @echo WARNING: "Support for distribution archives compressed with" \ + "legacy program 'compress' is deprecated." >&2 + @echo WARNING: "It will be removed altogether in Automake 2.0" >&2 shar $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).shar.gz $(am__post_remove_distdir) @@ -591,9 +594,10 @@ && dc_destdir="$${TMPDIR-/tmp}/am-dc-$$$$/" \ && am__cwd=`pwd` \ && $(am__cd) $(distdir)/_build \ - && ../configure --srcdir=.. --prefix="$$dc_install_base" \ + && ../configure \ $(AM_DISTCHECK_CONFIGURE_FLAGS) \ $(DISTCHECK_CONFIGURE_FLAGS) \ + --srcdir=.. --prefix="$$dc_install_base" \ && $(MAKE) $(AM_MAKEFLAGS) \ && $(MAKE) $(AM_MAKEFLAGS) dvi \ && $(MAKE) $(AM_MAKEFLAGS) check \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/aclocal.m4 new/hxtools-20140325/aclocal.m4 --- old/hxtools-20131222/aclocal.m4 2013-12-22 19:23:47.000000000 +0100 +++ new/hxtools-20140325/aclocal.m4 2014-03-25 19:40:05.000000000 +0100 @@ -1,4 +1,4 @@ -# generated automatically by aclocal 1.13.4 -*- Autoconf -*- +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- # Copyright (C) 1996-2013 Free Software Foundation, Inc. @@ -247,10 +247,10 @@ # generated from the m4 files accompanying Automake X.Y. # (This private macro should not be called outside this file.) AC_DEFUN([AM_AUTOMAKE_VERSION], -[am__api_version='1.13' +[am__api_version='1.14' dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to dnl require some minimum version. Point them to the right macro. -m4_if([$1], [1.13.4], [], +m4_if([$1], [1.14.1], [], [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl ]) @@ -266,7 +266,7 @@ # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. # This function is AC_REQUIREd by AM_INIT_AUTOMAKE. AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -[AM_AUTOMAKE_VERSION([1.13.4])dnl +[AM_AUTOMAKE_VERSION([1.14.1])dnl m4_ifndef([AC_AUTOCONF_VERSION], [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) @@ -633,6 +633,12 @@ # This macro actually does too much. Some checks are only needed if # your package does certain things. But this isn't really a big deal. +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + # AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) # AM_INIT_AUTOMAKE([OPTIONS]) # ----------------------------------------------- @@ -741,6 +747,49 @@ AC_CONFIG_COMMANDS_PRE(dnl [m4_provide_if([_AM_COMPILER_EXEEXT], [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi + AM_SILENT_RULES([yes]) ]) @@ -750,7 +799,6 @@ m4_define([_AC_COMPILER_EXEEXT], m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) - # When config.status generates a header, we must update the stamp-h file. # This file resides in the same directory as the config header # that is generated. The stamp files are numbered to have different names. @@ -862,38 +910,6 @@ rm -f confinc confmf ]) -# Copyright (C) 1999-2013 Free Software Foundation, Inc. -# -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# AM_PROG_CC_C_O -# -------------- -# Like AC_PROG_CC_C_O, but changed for automake. -AC_DEFUN([AM_PROG_CC_C_O], -[AC_REQUIRE([AC_PROG_CC_C_O])dnl -AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -AC_REQUIRE_AUX_FILE([compile])dnl -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $[2] | sed ['s/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/']` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi -dnl Make sure AC_PROG_CC is never called again, or it will override our -dnl setting of CC. -m4_define([AC_PROG_CC], - [m4_fatal([AC_PROG_CC cannot be called after AM_PROG_CC_C_O])]) -]) - # Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- # Copyright (C) 1997-2013 Free Software Foundation, Inc. @@ -964,6 +980,53 @@ AC_DEFUN([_AM_IF_OPTION], [m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + # Copyright (C) 2001-2013 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/build-aux/missing new/hxtools-20140325/build-aux/missing --- old/hxtools-20131222/build-aux/missing 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/build-aux/missing 2014-03-25 19:40:06.000000000 +0100 @@ -1,7 +1,7 @@ #! /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. # Originally written by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996. @@ -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' old/hxtools-20131222/config.h.in new/hxtools-20140325/config.h.in --- old/hxtools-20131222/config.h.in 2013-12-22 19:23:48.000000000 +0100 +++ new/hxtools-20140325/config.h.in 2014-03-25 19:40:06.000000000 +0100 @@ -6,6 +6,15 @@ /* Define to 1 if you have the <lastlog.h> header file. */ #undef HAVE_LASTLOG_H +/* */ +#undef HAVE_LIBMOUNT + +/* */ +#undef HAVE_LIBPCI + +/* */ +#undef HAVE_LIBXCB + /* Define to 1 if you have the <memory.h> header file. */ #undef HAVE_MEMORY_H @@ -33,9 +42,6 @@ /* Define to 1 if you have the <unistd.h> header file. */ #undef HAVE_UNISTD_H -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - /* Name of package */ #undef PACKAGE diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/configure new/hxtools-20140325/configure --- old/hxtools-20131222/configure 2013-12-22 19:23:48.000000000 +0100 +++ new/hxtools-20140325/configure 2014-03-25 19:40:06.000000000 +0100 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for hxtools 20131222. +# Generated by GNU Autoconf 2.69 for hxtools 20140325. # # # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc. @@ -577,8 +577,8 @@ # Identity of this package. PACKAGE_NAME='hxtools' PACKAGE_TARNAME='hxtools' -PACKAGE_VERSION='20131222' -PACKAGE_STRING='hxtools 20131222' +PACKAGE_VERSION='20140325' +PACKAGE_STRING='hxtools 20140325' PACKAGE_BUGREPORT='' PACKAGE_URL='' @@ -630,13 +630,10 @@ HAVE_LIBCAP_FALSE HAVE_LIBCAP_TRUE libcap_LIBS -HAVE_LIBXCB libxcb_LIBS libxcb_CFLAGS -HAVE_LIBPCI libpci_LIBS libpci_CFLAGS -HAVE_LIBMOUNT libmount_LIBS libmount_CFLAGS libHX_LIBS @@ -1297,7 +1294,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures hxtools 20131222 to adapt to many kinds of systems. +\`configure' configures hxtools 20140325 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1363,7 +1360,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of hxtools 20131222:";; + short | recursive ) echo "Configuration of hxtools 20140325:";; esac cat <<\_ACEOF @@ -1480,7 +1477,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -hxtools configure 20131222 +hxtools configure 20140325 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -1778,7 +1775,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by hxtools $as_me 20131222, which was +It was created by hxtools $as_me 20140325, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2250,7 +2247,7 @@ test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' -am__api_version='1.13' +am__api_version='1.14' { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5 $as_echo_n "checking whether build environment is sane... " >&6; } @@ -2643,7 +2640,7 @@ # Define the identity of the package. PACKAGE='hxtools' - VERSION='20131222' + VERSION='20140325' cat >>confdefs.h <<_ACEOF @@ -2778,6 +2775,49 @@ + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: <http://austingroupbugs.net/view.php?id=542> + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: <http://www.gnu.org/software/coreutils/>. + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + as_fn_error $? "Your 'rm' program is bad, sorry." "$LINENO" 5 + fi +fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -3606,6 +3646,65 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' ac_compiler_gnu=$ac_cv_c_compiler_gnu + +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC understands -c and -o together" >&5 +$as_echo_n "checking whether $CC understands -c and -o together... " >&6; } +if ${am_cv_prog_cc_c_o+:} false; then : + $as_echo_n "(cached) " >&6 +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +int +main () +{ + + ; + return 0; +} +_ACEOF + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if { echo "$as_me:$LINENO: $CC -c conftest.$ac_ext -o conftest2.$ac_objext" >&5 + ($CC -c conftest.$ac_ext -o conftest2.$ac_objext) >&5 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_prog_cc_c_o" >&5 +$as_echo "$am_cv_prog_cc_c_o" >&6; } +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +ac_ext=c +ac_cpp='$CPP $CPPFLAGS' +ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' +ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' +ac_compiler_gnu=$ac_cv_c_compiler_gnu + DEPDIR="${am__leading_dot}deps" ac_config_commands="$ac_config_commands depfiles" @@ -3798,131 +3897,6 @@ fi -if test "x$CC" != xcc; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC and cc understand -c and -o together" >&5 -$as_echo_n "checking whether $CC and cc understand -c and -o together... " >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether cc understands -c and -o together" >&5 -$as_echo_n "checking whether cc understands -c and -o together... " >&6; } -fi -set dummy $CC; ac_cc=`$as_echo "$2" | - sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ - -int -main () -{ - - ; - return 0; -} -_ACEOF -# Make sure it works both with $CC and with simple cc. -# We do the test twice because some compilers refuse to overwrite an -# existing .o file with -o, though they will create one. -ac_try='$CC -c conftest.$ac_ext -o conftest2.$ac_objext >&5' -rm -f conftest2.* -if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; -then - eval ac_cv_prog_cc_${ac_cc}_c_o=yes - if test "x$CC" != xcc; then - # Test first that cc exists at all. - if { ac_try='cc -c conftest.$ac_ext >&5' - { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; }; then - ac_try='cc -c conftest.$ac_ext -o conftest2.$ac_objext >&5' - rm -f conftest2.* - if { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; } && - test -f conftest2.$ac_objext && { { case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\"" -$as_echo "$ac_try_echo"; } >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 - test $ac_status = 0; }; - then - # cc works too. - : - else - # cc exists but doesn't like -o. - eval ac_cv_prog_cc_${ac_cc}_c_o=no - fi - fi - fi -else - eval ac_cv_prog_cc_${ac_cc}_c_o=no -fi -rm -f core conftest* - -fi -if eval test \$ac_cv_prog_cc_${ac_cc}_c_o = yes; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 -$as_echo "yes" >&6; } -else - { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 -$as_echo "no" >&6; } - -$as_echo "#define NO_MINUS_C_MINUS_O 1" >>confdefs.h - -fi - -# FIXME: we rely on the cache variable name because -# there is no other way. -set dummy $CC -am_cc=`echo $2 | sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'` -eval am_t=\$ac_cv_prog_cc_${am_cc}_c_o -if test "$am_t" != yes; then - # Losing compiler, so override with the script. - # FIXME: It is wrong to rewrite CC. - # But if we don't then we get into trouble of one sort or another. - # A longer-term fix would be to have automake use am__CC in this case, - # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" - CC="$am_aux_dir/compile $CC" -fi - @@ -4343,6 +4317,9 @@ + + + if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then if test -n "$ac_tool_prefix"; then # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args. @@ -4465,12 +4442,12 @@ pkg_cv_libHX_CFLAGS="$libHX_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libHX >= 3.12.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libHX >= 3.12.1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libHX >= 3.17\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libHX >= 3.17") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libHX_CFLAGS=`$PKG_CONFIG --cflags "libHX >= 3.12.1" 2>/dev/null` + pkg_cv_libHX_CFLAGS=`$PKG_CONFIG --cflags "libHX >= 3.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4482,12 +4459,12 @@ pkg_cv_libHX_LIBS="$libHX_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libHX >= 3.12.1\""; } >&5 - ($PKG_CONFIG --exists --print-errors "libHX >= 3.12.1") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libHX >= 3.17\""; } >&5 + ($PKG_CONFIG --exists --print-errors "libHX >= 3.17") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libHX_LIBS=`$PKG_CONFIG --libs "libHX >= 3.12.1" 2>/dev/null` + pkg_cv_libHX_LIBS=`$PKG_CONFIG --libs "libHX >= 3.17" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4508,14 +4485,14 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libHX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libHX >= 3.12.1" 2>&1` + libHX_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libHX >= 3.17" 2>&1` else - libHX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libHX >= 3.12.1" 2>&1` + libHX_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libHX >= 3.17" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libHX_PKG_ERRORS" >&5 - as_fn_error $? "Package requirements (libHX >= 3.12.1) were not met: + as_fn_error $? "Package requirements (libHX >= 3.17) were not met: $libHX_PKG_ERRORS @@ -4556,12 +4533,12 @@ pkg_cv_libmount_CFLAGS="$libmount_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mount >= 2.20\""; } >&5 - ($PKG_CONFIG --exists --print-errors "mount >= 2.20") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mount >= 2.19\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mount >= 2.19") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libmount_CFLAGS=`$PKG_CONFIG --cflags "mount >= 2.20" 2>/dev/null` + pkg_cv_libmount_CFLAGS=`$PKG_CONFIG --cflags "mount >= 2.19" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4573,12 +4550,12 @@ pkg_cv_libmount_LIBS="$libmount_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ - { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mount >= 2.20\""; } >&5 - ($PKG_CONFIG --exists --print-errors "mount >= 2.20") 2>&5 + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"mount >= 2.19\""; } >&5 + ($PKG_CONFIG --exists --print-errors "mount >= 2.19") 2>&5 ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_libmount_LIBS=`$PKG_CONFIG --libs "mount >= 2.20" 2>/dev/null` + pkg_cv_libmount_LIBS=`$PKG_CONFIG --libs "mount >= 2.19" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -4599,26 +4576,46 @@ _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - libmount_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mount >= 2.20" 2>&1` + libmount_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "mount >= 2.19" 2>&1` else - libmount_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mount >= 2.20" 2>&1` + libmount_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "mount >= 2.19" 2>&1` fi # Put the nasty error message in config.log where it belongs echo "$libmount_PKG_ERRORS" >&5 - HAVE_LIBMOUNT="" + as_fn_error $? "Package requirements (mount >= 2.19) were not met: + +$libmount_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables libmount_CFLAGS +and libmount_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - HAVE_LIBMOUNT="" + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables libmount_CFLAGS +and libmount_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } else libmount_CFLAGS=$pkg_cv_libmount_CFLAGS libmount_LIBS=$pkg_cv_libmount_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - HAVE_LIBMOUNT=1 -fi + $as_echo "#define HAVE_LIBMOUNT 1" >>confdefs.h +fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpci" >&5 @@ -4678,19 +4675,39 @@ # Put the nasty error message in config.log where it belongs echo "$libpci_PKG_ERRORS" >&5 - HAVE_LIBPCI="" + as_fn_error $? "Package requirements (libpci >= 3) were not met: + +$libpci_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables libpci_CFLAGS +and libpci_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - HAVE_LIBPCI="" + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables libpci_CFLAGS +and libpci_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } else libpci_CFLAGS=$pkg_cv_libpci_CFLAGS libpci_LIBS=$pkg_cv_libpci_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - HAVE_LIBPCI=1 -fi + $as_echo "#define HAVE_LIBPCI 1" >>confdefs.h +fi pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libxcb" >&5 @@ -4750,19 +4767,39 @@ # Put the nasty error message in config.log where it belongs echo "$libxcb_PKG_ERRORS" >&5 - HAVE_LIBXCB="" + as_fn_error $? "Package requirements (xcb >= 1) were not met: + +$libxcb_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +Alternatively, you may set the environment variables libxcb_CFLAGS +and libxcb_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details." "$LINENO" 5 elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - HAVE_LIBXCB="" + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +Alternatively, you may set the environment variables libxcb_CFLAGS +and libxcb_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details. + +To get pkg-config, see <http://pkg-config.freedesktop.org/>. +See \`config.log' for more details" "$LINENO" 5; } else libxcb_CFLAGS=$pkg_cv_libxcb_CFLAGS libxcb_LIBS=$pkg_cv_libxcb_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - HAVE_LIBXCB=1 -fi + $as_echo "#define HAVE_LIBXCB 1" >>confdefs.h +fi { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing cap_get_pid" >&5 $as_echo_n "checking for library containing cap_get_pid... " >&6; } if ${ac_cv_search_cap_get_pid+:} false; then : @@ -5445,7 +5482,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by hxtools $as_me 20131222, which was +This file was extended by hxtools $as_me 20140325, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -5511,7 +5548,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -hxtools config.status 20131222 +hxtools config.status 20140325 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/configure.ac new/hxtools-20140325/configure.ac --- old/hxtools-20131222/configure.ac 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/configure.ac 2014-03-25 19:39:42.000000000 +0100 @@ -1,4 +1,4 @@ -AC_INIT([hxtools], [20131222]) +AC_INIT([hxtools], [20140325]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_HEADERS([config.h]) AC_PROG_INSTALL @@ -7,13 +7,13 @@ AM_PROG_CC_C_O AC_CHECK_HEADERS([lastlog.h paths.h]) -PKG_CHECK_MODULES([libHX], [libHX >= 3.12.1]) -PKG_CHECK_MODULES([libmount], [mount >= 2.20], [HAVE_LIBMOUNT=1], [HAVE_LIBMOUNT=""]) -AC_SUBST([HAVE_LIBMOUNT]) -PKG_CHECK_MODULES([libpci], [libpci >= 3], [HAVE_LIBPCI=1], [HAVE_LIBPCI=""]) -AC_SUBST([HAVE_LIBPCI]) -PKG_CHECK_MODULES([libxcb], [xcb >= 1], [HAVE_LIBXCB=1], [HAVE_LIBXCB=""]) -AC_SUBST([HAVE_LIBXCB]) +AH_TEMPLATE([HAVE_LIBMOUNT]) +AH_TEMPLATE([HAVE_LIBPCI]) +AH_TEMPLATE([HAVE_LIBXCB]) +PKG_CHECK_MODULES([libHX], [libHX >= 3.17]) +PKG_CHECK_MODULES([libmount], [mount >= 2.19], [AC_DEFINE([HAVE_LIBMOUNT], [1])], []) +PKG_CHECK_MODULES([libpci], [libpci >= 3], [AC_DEFINE([HAVE_LIBPCI], [1])], []) +PKG_CHECK_MODULES([libxcb], [xcb >= 1], [AC_DEFINE([HAVE_LIBXCB], [1])], []) AC_SEARCH_LIBS([cap_get_pid], [cap], [libcap_LIBS="$LIBS"; LIBS=""]) AC_SUBST([libcap_LIBS]) AM_CONDITIONAL([HAVE_LIBCAP], [test -n "$libcap_LIBS"]) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/cooledit/HX_c.syntax new/hxtools-20140325/cooledit/HX_c.syntax --- old/hxtools-20131222/cooledit/HX_c.syntax 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/cooledit/HX_c.syntax 2014-03-25 19:39:42.000000000 +0100 @@ -14,70 +14,52 @@ keyword whole bool white keyword whole break white keyword whole case white - keyword whole catch white keyword whole char white - keyword whole class white keyword whole const white - keyword whole const_cast1 white - keyword whole const_cast2 white - keyword whole const_cast3 white - keyword whole const_cast white keyword whole continue white keyword whole default white keyword whole delete white keyword whole do white keyword whole double white - keyword whole dynamic_cast white keyword whole else white keyword whole enum white - keyword whole explicit white keyword whole extern white - keyword whole flag_t white keyword whole float white keyword whole for white - keyword whole friend white keyword whole goto white keyword whole if white keyword whole inline white - keyword whole int16_t white - keyword whole int32_t white - keyword whole int64_t white - keyword whole int8_t white keyword whole int white - keyword whole loff_t white keyword whole long white - keyword whole mutable white - keyword whole namespace white - keyword whole new white - keyword whole off64_t white - keyword whole off_t white - keyword whole operator white - keyword whole private white - keyword whole protected white - keyword whole public white keyword whole register white - keyword whole reinterpret_cast white keyword whole restrict white keyword whole return white keyword whole short white - keyword whole signed_cast white keyword whole signed white - keyword whole size_t white keyword whole sizeof white - keyword whole ssize_t white keyword whole static white - keyword whole static_cast white keyword whole struct white keyword whole switch white - keyword whole template white - keyword whole this white - keyword whole throw white - keyword whole time_t white - keyword whole try white keyword whole typedef white - keyword whole typeid white - keyword whole typename white keyword whole typeof white + keyword whole union white + keyword whole unsigned white + keyword whole void white + keyword whole volatile white + keyword whole wchar_t white + keyword whole while white + + # Not keywords, but common types + keyword whole int16_t white + keyword whole int32_t white + keyword whole int64_t white + keyword whole int8_t white + keyword whole loff_t white + keyword whole off64_t white + keyword whole off_t white + keyword whole size_t white + keyword whole ssize_t white + keyword whole time_t white keyword whole u_int16_t white keyword whole u_int32_t white keyword whole u_int64_t white @@ -86,14 +68,39 @@ keyword whole uint32_t white keyword whole uint64_t white keyword whole uint8_t white - keyword whole union white - keyword whole unsigned white + + # libHX or C++ + keyword whole const_cast1 white + keyword whole const_cast2 white + keyword whole const_cast3 white + keyword whole const_cast white + keyword whole dynamic_cast white + keyword whole reinterpret_cast white + keyword whole signed_cast white + keyword whole static_cast white + + # C++ + keyword whole catch white + keyword whole class white + keyword whole explicit white + keyword whole final white + keyword whole friend white + keyword whole mutable white + keyword whole namespace white + keyword whole new white + keyword whole operator white + keyword whole override white + keyword whole private white + keyword whole protected white + keyword whole public white + keyword whole template white + keyword whole this white + keyword whole throw white + keyword whole try white + keyword whole typeid white + keyword whole typename white keyword whole using white keyword whole virtual white - keyword whole void white - keyword whole volatile white - keyword whole wchar_t white - keyword whole while white keyword /\* yellow keyword \*/ yellow diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/data/Makefile.in new/hxtools-20140325/data/Makefile.in --- old/hxtools-20131222/data/Makefile.in 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/data/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -160,9 +160,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/data/gitconfig new/hxtools-20140325/data/gitconfig --- old/hxtools-20131222/data/gitconfig 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/data/gitconfig 2014-03-25 19:39:42.000000000 +0100 @@ -14,15 +14,24 @@ frag = magenta meta = bold white blue +[color "decorate"] + branch = bold green + remotebranch = bold magenta + tag = bold yellow + stash = bold blue + HEAD = bold cyan + [alias] ac = commit --amend br = branch ci = commit co = checkout dc = diff --cached - st = status - re = rebase + lg = log --oneline rc = rebase --continue + re = rebase + st = status + up = remote update -p [push] default = current diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/doc/Makefile.in new/hxtools-20140325/doc/Makefile.in --- old/hxtools-20131222/doc/Makefile.in 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/doc/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -164,9 +164,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/doc/NEWS.txt new/hxtools-20140325/doc/NEWS.txt --- old/hxtools-20131222/doc/NEWS.txt 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/doc/NEWS.txt 2014-03-25 19:39:42.000000000 +0100 @@ -1,4 +1,9 @@ +rel-20140325 +============ +* bin2c now supports the -p option to strip paths +* bin2c also defaults to stripping all leading paths + rel-20131222 ============ * bin2c: new utility which replaces png2wx.pl and png2wx.py diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/doc/bin2c.1 new/hxtools-20140325/doc/bin2c.1 --- old/hxtools-20131222/doc/bin2c.1 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/doc/bin2c.1 2014-03-25 19:39:42.000000000 +0100 @@ -5,7 +5,8 @@ .SH Syntax .PP \fBbin2c\fP [\fB\-C\fP \fIprogram-file\fP] [\fB\-H\fP \fIheader-file\fP] -[\fB\-G\fP \fIguard-name\fP] [\fB\-v\fP] [\fB\-\-wxbitmap\fP] \fIfile\fP... +[\fB\-G\fP \fIguard-name\fP] [\fB\-p\fP \fInum\fP] [\fB\-v\fP] +[\fB\-\-wxbitmap\fP] \fIfile\fP... .SH Description .PP bin2c converts files to C variables. It does so by reading the contents of each @@ -38,6 +39,11 @@ and it will contain the variable definition, the latter of which will be marked as \fBstatic\fP (file scope). .TP +\fB\-p\fP \fInum\fP +Strip \fInum\fP leading path components when transforming input paths to +variable names. If \fInum\fP is negative, that many trailing path components +are \fBretained\fP. If \fB\-p\fP is not specified, the default is -1. +.TP \fB\-v\fP Be verbose. Show all the names and filenames that bin2c will write. .TP diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/doc/sysinfo.1 new/hxtools-20140325/doc/sysinfo.1 --- old/hxtools-20131222/doc/sysinfo.1 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/doc/sysinfo.1 2014-03-25 19:39:42.000000000 +0100 @@ -5,16 +5,24 @@ .\" not just for bragging - can also be useful in bug reports .SH Syntax .PP -\fBsysinfo\fP +\fBsysinfo\fP [\fB\-v\fP] +.SH Options +.TP +\fB\-v\fP +Print additional info if sysinfo could not determine certain parameters because +it was compiled without one or more of libmount, libpci or libxcb. .SH Description .PP Prints out an IRC-style machine info, like: .PP -[seven] Linux 3.4.4-jng6-default x86_64 | 8-thr Intel(R) Core(TM) i7-2600 CPU -3401MHz | Load: 0.51 Tasks: 461 | Mem: 2672/32155MB | Disk: 656/2791GB | Gfx: -Intel Corporation 2nd Generation Core Processor Family Integrated Graphics +[ares08] Linux 3.13.4-jng21-default x86_64 | 8-thr Intel(R) Core(TM) i7-2600 +CPU 3800MHz | Load: 0.06 Tasks: 534 | Mem: 20222/32154MB | Disk: 1393/2904GB | +Gfx: Intel Corporation 2nd Generation Core Processor Family Integrated Graphics Controller @ 1280x1024 .PP +[ares01] Linux 3.13.6+ sparc64 | 24-thr UltraSparc T1 (Niagara) 1000MHz | +Load: 27.80 Tasks: 489 | Mem: 2048/7979MB | Disk: 1001/1833GB +.PP The load number is the EWMA over the last 60 seconds. The values shown for memory and disk are the used amount and the total amount (NOT the free amount and the total amount). The used memory value may theoretically exceed that of @@ -22,9 +30,11 @@ \fBand\fP tmpfs files have been moved to swap (i.e. you are approaching more trouble). .PP -The @\fIxres\fPx\fIyres\fP is only available if $DISPLAY is set and valid. -\fIxres\fP and \fIyres\fP will be the dimensions of the \fBvirtual\fP size, not -the resolution of any particular monitor. +The @\fIxsize\fPx\fIysize\fP describes the size of the entire X framebuffer +("virtual desktop"), and will only be printed if $DISPLAY is set and valid. The +size is specific to the particular display server, and need not coincide with +the display attached to the shown graphics car (for example, when DISPLAY is +set to point to an Xvnc instance or a remote DISPLAY). .SH See also .PP \fBhxtools\fP(7) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/kbd/Makefile.in new/hxtools-20140325/kbd/Makefile.in --- old/hxtools-20131222/kbd/Makefile.in 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/kbd/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -164,9 +164,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/sadmin/Makefile.am new/hxtools-20140325/sadmin/Makefile.am --- old/hxtools-20131222/sadmin/Makefile.am 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/sadmin/Makefile.am 2014-03-25 19:39:42.000000000 +0100 @@ -13,11 +13,13 @@ pkglibexec_PROGRAMS = \ fd0ssh \ - printcaps \ proc_iomem_count \ proc_stat_parse \ psthreads \ utmp_register +if HAVE_LIBCAP +pkglibexec_PROGRAMS += printcaps +endif dist_pkglibexec_SCRIPTS = \ logontime \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/sadmin/Makefile.in new/hxtools-20140325/sadmin/Makefile.in --- old/hxtools-20131222/sadmin/Makefile.in 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/sadmin/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -80,9 +80,10 @@ PRE_UNINSTALL = : POST_UNINSTALL = : bin_PROGRAMS = clock_info$(EXEEXT) ofl$(EXEEXT) -pkglibexec_PROGRAMS = fd0ssh$(EXEEXT) printcaps$(EXEEXT) \ - proc_iomem_count$(EXEEXT) proc_stat_parse$(EXEEXT) \ - psthreads$(EXEEXT) utmp_register$(EXEEXT) +pkglibexec_PROGRAMS = fd0ssh$(EXEEXT) proc_iomem_count$(EXEEXT) \ + proc_stat_parse$(EXEEXT) psthreads$(EXEEXT) \ + utmp_register$(EXEEXT) $(am__EXEEXT_1) +@HAVE_LIBCAP_TRUE@am__append_1 = printcaps noinst_PROGRAMS = xfs_irecover$(EXEEXT) subdir = sadmin DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ @@ -98,6 +99,7 @@ CONFIG_CLEAN_VPATH_FILES = am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" \ "$(DESTDIR)$(bindir)" "$(DESTDIR)$(pkglibexecdir)" +@HAVE_LIBCAP_TRUE@am__EXEEXT_1 = printcaps$(EXEEXT) PROGRAMS = $(bin_PROGRAMS) $(noinst_PROGRAMS) $(pkglibexec_PROGRAMS) clock_info_SOURCES = clock_info.c clock_info_OBJECTS = clock_info.$(OBJEXT) @@ -235,9 +237,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/sdevel/Makefile.in new/hxtools-20140325/sdevel/Makefile.in --- old/hxtools-20131222/sdevel/Makefile.in 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/sdevel/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -210,9 +210,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/sdevel/bin2c.c new/hxtools-20140325/sdevel/bin2c.c --- old/hxtools-20131222/sdevel/bin2c.c 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/sdevel/bin2c.c 2014-03-25 19:39:42.000000000 +0100 @@ -1,6 +1,6 @@ /* * bin2c - convert arbitrary files into C variable definitions - * Copyright by Jan Engelhardt, 2004-2008 + * Copyright by Jan Engelhardt, 2004–2008,2013–2014 * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -17,6 +17,7 @@ #include <string.h> #include <sys/stat.h> #include <libHX/ctype_helper.h> +#include <libHX/defs.h> #include <libHX/option.h> #include <libHX/string.h> #if CHAR_BIT > 8 @@ -52,6 +53,7 @@ static unsigned int btc_verbose, btc_emit_wxbitmap; static const char btc_quote_needed[] = "\"?\\"; static const struct btc_operations *btc_ops; +static int btc_strip = -1; static size_t btc_qsize_cstring(const void *src, size_t input_size) { @@ -125,13 +127,13 @@ * char[N] with N >= 3 too. */ if (state->cfp != state->hfp) { - fprintf(state->hfp, "extern const unsigned char bin2c_%s[%zu];\n", + fprintf(state->hfp, "extern const unsigned char bin2c_%s[%" HX_SIZET_FMT "u];\n", state->vname, state->isize + 1); - fprintf(state->cfp, "const unsigned char bin2c_%s[%zu] = \"", + fprintf(state->cfp, "const unsigned char bin2c_%s[%" HX_SIZET_FMT "u] = \"", state->vname, state->isize + 1); } else { fprintf(state->cfp, - "static const unsigned char bin2c_%s[%zu] = \"", + "static const unsigned char bin2c_%s[%" HX_SIZET_FMT "u] = \"", state->vname, state->isize + 1); } @@ -204,7 +206,7 @@ fwrite(output_buf, strlen(output_buf), 1, state->cfp); free(output_buf); } - fprintf(state->cfp, "\", %zu);\n\t\tbin2c_%s = new wxBitmap(wxImage(sm, wxBITMAP_TYPE_ANY), -1);\n\t}\n", + fprintf(state->cfp, "\", %" HX_SIZET_FMT "u);\n\t\tbin2c_%s = new wxBitmap(wxImage(sm, wxBITMAP_TYPE_ANY), -1);\n\t}\n", state->isize, state->vname); } @@ -222,9 +224,29 @@ */ static hxmc_t *btc_construct_vname(const char *cfile) { - hxmc_t *vname = HXmc_strinit(cfile); + const char *eof; + hxmc_t *vname; + int strip = btc_strip; char *p; + /* move @cfile forward as many paths as btc_strip specifies */ + for (; strip > 0; --strip) { + while (*cfile != '/' && *cfile != '\0') + ++cfile; + while (*cfile == '/') + ++cfile; + } + /* move @eof backward as many paths as btc_strip specifies */ + eof = cfile + strlen(cfile) - 1; + for (; strip < 0; ++strip) { + while (eof >= cfile && *eof == '/') + --eof; + while (eof >= cfile && *eof != '/') + --eof; + cfile = eof + 1; + } + + vname = HXmc_strinit(cfile); if (vname == NULL) return NULL; if (!HX_isalpha(*cfile) && *cfile != '_') { @@ -250,7 +272,6 @@ static int btc_process_single(struct btc_state *state) { struct stat sb; - size_t input_len; state->ifp = fopen(state->ifile, "r"); if (state->ifp == NULL) { @@ -278,7 +299,6 @@ static int btc_start(const char **argv) { struct btc_state state; - FILE *hfilp, *cfilp = NULL; const char **arg; char *result; int ret = 0; @@ -340,6 +360,8 @@ .help = "Name for the header's include guard"}, {.sh = 'H', .type = HXTYPE_MCSTR, .ptr = &btc_hfile, .help = "Filename for the output .h file", .htyp = "FILE"}, + {.sh = 'p', .type = HXTYPE_INT, .ptr = &btc_strip, + .help = "Strip N path components (keep -N if N is negative)", .htyp = "N"}, {.sh = 'v', .type = HXTYPE_NONE, .ptr = &btc_verbose, .help = "Be verbose during operation"}, {.ln = "wxbitmap", .type = HXTYPE_NONE, .ptr = &btc_emit_wxbitmap, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/smath/Makefile.in new/hxtools-20140325/smath/Makefile.in --- old/hxtools-20131222/smath/Makefile.in 2013-12-22 19:23:49.000000000 +0100 +++ new/hxtools-20140325/smath/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -174,9 +174,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/smm/Makefile.in new/hxtools-20140325/smm/Makefile.in --- old/hxtools-20131222/smm/Makefile.in 2013-12-22 19:23:50.000000000 +0100 +++ new/hxtools-20140325/smm/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -222,9 +222,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/suser/Makefile.in new/hxtools-20140325/suser/Makefile.in --- old/hxtools-20131222/suser/Makefile.in 2013-12-22 19:23:50.000000000 +0100 +++ new/hxtools-20140325/suser/Makefile.in 2014-03-25 19:40:06.000000000 +0100 @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.13.4 from Makefile.am. +# Makefile.in generated by automake 1.14.1 from Makefile.am. # @configure_input@ # Copyright (C) 1994-2013 Free Software Foundation, Inc. @@ -214,9 +214,6 @@ EGREP = @EGREP@ EXEEXT = @EXEEXT@ GREP = @GREP@ -HAVE_LIBMOUNT = @HAVE_LIBMOUNT@ -HAVE_LIBPCI = @HAVE_LIBPCI@ -HAVE_LIBXCB = @HAVE_LIBXCB@ INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ INSTALL_PROGRAM = @INSTALL_PROGRAM@ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/hxtools-20131222/suser/sysinfo.c new/hxtools-20140325/suser/sysinfo.c --- old/hxtools-20131222/suser/sysinfo.c 2013-12-22 19:23:29.000000000 +0100 +++ new/hxtools-20140325/suser/sysinfo.c 2014-03-25 19:39:42.000000000 +0100 @@ -49,6 +49,7 @@ static const char *sy_cpuinfo_file = "/proc/cpuinfo"; static const char sysfs_cpu_dir[] = "/sys/devices/system/cpu"; +static unsigned int sy_verbose; static void sy_num_cpu_threads(struct sy_block *sib) { @@ -246,6 +247,8 @@ iter = mnt_new_iter(MNT_ITER_FORWARD); if (iter == NULL) goto out; + + sib->disk_total = 0; while (mnt_table_next_fs(table, iter, &fs) == 0) { const char *source = mnt_fs_get_source(fs); const char *mntpt = mnt_fs_get_target(fs); @@ -363,9 +366,12 @@ sib->mem_total / 1024); /* disk */ - printf(" | Disk: %llu/%lluGB", - sib->disk_used / (1024 * 1048576), - sib->disk_total / (1024 * 1048576)); + if (sib->disk_total != -1) + printf(" | Disk: %llu/%lluGB", + sib->disk_used / (1024 * 1048576), + sib->disk_total / (1024 * 1048576)); + else if (sy_verbose) + printf(" | Disk: <libmount missing>"); /* gfx */ if (sib->gfx_hardware != NULL || sib->display_width != 0 || @@ -376,6 +382,14 @@ if (sib->display_width != 0 || sib->display_height != 0) printf(" @ %ux%u", sib->display_width, sib->display_height); + } else if (sy_verbose) { + printf(" | Gfx:"); +#ifndef HAVE_LIBPCI + printf(" <libpci missing>"); +#endif +#ifndef HAVE_LIBXCB + printf(" <libxcb missing>"); +#endif } printf("\n"); } @@ -385,6 +399,8 @@ static const struct HXoption options_table[] = { {.sh = 'P', .type = HXTYPE_STRING, .ptr = &sy_cpuinfo_file, .help = "Debug: specify alternate cpuinfo file", .htyp = "FILE"}, + {.sh = 'v', .type = HXTYPE_NONE, .ptr = &sy_verbose, + .help = "Verbose reporting"}, HXOPT_AUTOHELP, HXOPT_TABLEEND, }; @@ -402,6 +418,7 @@ return EXIT_FAILURE; memset(&sib, 0, sizeof(sib)); + sib.disk_total = -1; uname(&sib.uts); sy_num_cpu_threads(&sib); sy_proc_cpuinfo(&sib); -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de