diff options
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | VERSION | 4 | ||||
| -rw-r--r-- | attr/attr.c | 10 | ||||
| -rw-r--r-- | configure.in | 60 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | doc/CHANGES | 3 | ||||
| -rw-r--r-- | getfattr/getfattr.c | 12 | ||||
| -rw-r--r-- | include/Makefile | 2 | ||||
| -rw-r--r-- | include/builddefs.in | 75 | ||||
| -rw-r--r-- | include/buildmacros | 17 | ||||
| -rw-r--r-- | include/buildrules | 11 | ||||
| -rw-r--r-- | include/config.h.in | 49 | ||||
| -rw-r--r-- | po/Makefile | 51 | ||||
| -rw-r--r-- | po/attr.pot | 105 | ||||
| -rw-r--r-- | setfattr/setfattr.c | 10 |
16 files changed, 350 insertions, 69 deletions
@@ -37,13 +37,13 @@ ifeq ($(HAVE_BUILDDEFS), yes) include $(TOPDIR)/include/builddefs endif -CONFIGURE = configure include/builddefs +CONFIGURE = configure include/builddefs include/config.h LSRCFILES = configure configure.in Makepkgs install-sh README VERSION LDIRT = config.log .dep config.status config.cache confdefs.h conftest* \ Logs/* built .census install.* install-dev.* install-lib.* *.gz -SUBDIRS = include libattr attr getfattr setfattr test man doc debian build +SUBDIRS = include libattr attr getfattr setfattr test man doc po debian build default: $(CONFIGURE) ifeq ($(HAVE_BUILDDEFS), no) @@ -2,6 +2,6 @@ # This file is used by configure to get version information # PKG_MAJOR=2 -PKG_MINOR=1 -PKG_REVISION=2 +PKG_MINOR=2 +PKG_REVISION=0 PKG_BUILD=0 diff --git a/attr/attr.c b/attr/attr.c index 298050f..e4c4e25 100644 --- a/attr/attr.c +++ b/attr/attr.c @@ -39,12 +39,10 @@ #include <unistd.h> #include <errno.h> #include <string.h> +#include <locale.h> #include <attr/attributes.h> - -#include <locale.h> -#include <libintl.h> -#define _(String) gettext (String) +#include "config.h" #define SETOP 1 /* do a SET operation */ #define GETOP 2 /* do a GET operation */ @@ -73,6 +71,10 @@ main(int argc, char **argv) progname = basename(argv[0]); + setlocale(LC_CTYPE, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + /* * Pick up and validate the arguments. */ diff --git a/configure.in b/configure.in index 12c44c2..f426da5 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,7 @@ dnl unpacking check - this file must exist AC_INIT(include/attributes.h) +AC_CONFIG_HEADER(include/config.h) + pkg_name="attr" AC_SUBST(pkg_name) @@ -7,8 +9,10 @@ AC_SUBST(pkg_name) # Note: the following environment variables may be set to override the # defaults (to change paths and/or executables, build parameters, etc): # -# DEBUG OPTIMIZER MAKE CC LD TAR ZIP RPM AWK SED ECHO -# LIBTOOL MALLOCLIB DISTRIBUTION PACKAGE_BUILDER +# DEBUG OPTIMIZER MALLOCLIB +# PLATFORM DISTRIBUTION BUILDER +# MAKE CC LD TAR ZIP AWK SED ECHO RPM LIBTOOL +# MSGFMT MSGMERGE XGETTEXT # DEBUG=${DEBUG:-'-DDEBUG'} # -DNDEBUG @@ -35,12 +39,16 @@ pkg_release=$PKG_BUILD AC_SUBST(pkg_version) AC_SUBST(pkg_release) -pkg_distribution="Generic Linux" +pkg_platform=`uname -s` +pkg_distribution="Generic $pkg_platform" +pkg_platform=`echo $pkg_platform | tr 'A-Z' 'a-z'` +test -z "$PLATFORM" || pkg_platform="$PLATFORM" test -z "$DISTRIBUTION" || pkg_distribution="$DISTRIBUTION" AC_SUBST(pkg_distribution) +AC_SUBST(pkg_platform) pkg_builder=`id -u -n`@`hostname` -test -z "$PACKAGE_BUILDER" || pkg_builder="$PACKAGE_BUILDER" +test -z "$BUILDER" || pkg_builder="$BUILDER" AC_SUBST(pkg_builder) dnl check if user wants their own C compiler @@ -68,6 +76,11 @@ test -z "$ZIP" && AC_PATH_PROG(ZIP, gzip, /bin/gzip) zip=$ZIP AC_SUBST(zip) +dnl check if the makedepend program is available +test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true) +makedepend=$MAKEDEPEND +AC_SUBST(makedepend) + dnl check if the rpm program is available test -z "$RPM" && AC_PATH_PROG(RPM, rpm, /bin/rpm) rpm=$RPM @@ -89,18 +102,7 @@ if test $rpm_version -ge 4; then else rpmbuild=$RPM fi - AC_SUBST(rpmbuild) - -dnl check if the msgfmt program is available -test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt) -msgfmt=$MSGFMT -AC_SUBST(msgfmt) - -dnl check if the makedepend program is available -test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true) -makedepend=$MAKEDEPEND -AC_SUBST(makedepend) dnl check if symbolic links are supported AC_PROG_LN_S @@ -116,6 +118,27 @@ test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo) echo=$ECHO AC_SUBST(echo) +dnl check if the msgfmt program is available +test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt) +msgfmt=$MSGFMT +AC_SUBST(msgfmt) + +dnl check if the msgmerge program is available +test -z "$MSGMERGE" && AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge) +msgmerge=$MSGMERGE +AC_SUBST(msgmerge) + +dnl ensure xgettext is installed +test -z "$XGETTEXT" && AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext) +if test "$XGETTEXT" = ""; then + echo + echo 'FATAL ERROR: xgettext does not seem to be installed.' + echo $pkg_name cannot be built without a working gettext installation. + exit 1 +fi +xgettext=$XGETTEXT +AC_SUBST(xgettext) + dnl ensure libtool is installed test -z "$LIBTOOL" && AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin) if test "$LIBTOOL" = ""; then @@ -133,6 +156,13 @@ AC_ARG_ENABLE(shared, enable_shared=yes) AC_SUBST(enable_shared) +dnl will we be making use of gettext? +AC_ARG_ENABLE(gettext, + [ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],, + enable_gettext=yes) +test $enable_gettext = "yes" && AC_DEFINE(ENABLE_GETTEXT) +AC_SUBST(enable_gettext) + dnl man pages (source) dnl also check if man page source is gzipped dnl (usually on Debian, but not Redhat pre-7.0) diff --git a/debian/changelog b/debian/changelog index 458daf2..30f2b3e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ -attr (2.1.2-1) unstable; urgency=low +attr (2.2.0-1) unstable; urgency=low * New upstream release - -- Nathan Scott <nathans@debian.org> Mon, 25 Nov 2002 11:26:30 +1100 + -- Nathan Scott <nathans@debian.org> Sat, 30 Nov 2002 12:23:15 +1100 attr (2.1.1-1) unstable; urgency=low diff --git a/debian/control b/debian/control index a97e401..1d00a8b 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: attr Section: utils Priority: optional Maintainer: Nathan Scott <nathans@debian.org> -Build-Depends: autoconf, debmake, libtool +Build-Depends: autoconf, debmake, gettext, libtool Standards-Version: 3.5.5 Package: attr diff --git a/doc/CHANGES b/doc/CHANGES index 511ad25..598df95 100644 --- a/doc/CHANGES +++ b/doc/CHANGES @@ -1,3 +1,6 @@ +attr-2.2.0 (30 November 2002) + - Complete the internationalisation support. + attr-2.1.2 (22 November 2002) - Add a description of trusted extended attributes to attr(5). diff --git a/getfattr/getfattr.c b/getfattr/getfattr.c index 6dea58b..1ff1647 100644 --- a/getfattr/getfattr.c +++ b/getfattr/getfattr.c @@ -27,12 +27,11 @@ #include <ctype.h> #include <getopt.h> #include <regex.h> -#include <attr/xattr.h> #include <ftw.h> - #include <locale.h> -#include <libintl.h> -#define _(String) gettext (String) + +#include <attr/xattr.h> +#include "config.h" #define CMD_LINE_OPTIONS "n:de:m:hRLP" #define CMD_LINE_SPEC "[-hRLP] [-n name|-d] [-e en] [-m pattern] path..." @@ -410,7 +409,10 @@ int main(int argc, char *argv[]) int opt; progname = basename(argv[0]); - setlocale(LC_ALL, ""); + + setlocale(LC_CTYPE, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); while ((opt = getopt_long(argc, argv, CMD_LINE_OPTIONS, long_options, NULL)) != -1) { diff --git a/include/Makefile b/include/Makefile index fde112b..b5a94a2 100644 --- a/include/Makefile +++ b/include/Makefile @@ -35,7 +35,7 @@ include $(TOPDIR)/include/builddefs INCDIR = attr HFILES = attributes.h xattr.h -LSRCFILES = builddefs.in buildmacros buildrules +LSRCFILES = builddefs.in buildmacros buildrules config.h.in LDIRT = $(INCDIR) default: diff --git a/include/builddefs.in b/include/builddefs.in index df2f1aa..cea6d61 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -44,42 +44,55 @@ LIBATTR = $(TOPDIR)/libattr/libattr.la prefix = @prefix@ exec_prefix = @exec_prefix@ -PKG_NAME = @pkg_name@ -PKG_RELEASE = @pkg_release@ -PKG_VERSION = @pkg_version@ -PKG_DISTRIBUTION = @pkg_distribution@ -PKG_BUILDER = @pkg_builder@ -PKG_BIN_DIR = @bindir@ -PKG_SBIN_DIR = @sbindir@ -PKG_LIB_DIR = @libdir@ -PKG_DEVLIB_DIR = @libexecdir@ -PKG_INC_DIR = @includedir@/attr -PKG_MAN_DIR = @mandir@ -PKG_DOC_DIR = @datadir@/doc/@pkg_name@ +PKG_NAME = @pkg_name@ +PKG_RELEASE = @pkg_release@ +PKG_VERSION = @pkg_version@ +PKG_PLATFORM = @pkg_platform@ +PKG_DISTRIBUTION= @pkg_distribution@ +PKG_BUILDER = @pkg_builder@ +PKG_BIN_DIR = @bindir@ +PKG_SBIN_DIR = @sbindir@ +PKG_LIB_DIR = @libdir@ +PKG_DEVLIB_DIR = @libexecdir@ +PKG_INC_DIR = @includedir@/attr +PKG_MAN_DIR = @mandir@ +PKG_DOC_DIR = @datadir@/doc/@pkg_name@ +PKG_LOCALE_DIR = @datadir@/locale -CC = @cc@ -LD = @ld@ -AWK = @awk@ -SED = @sed@ -MAKE = @make@ -ECHO = @echo@ -LN_S = @LN_S@ -ZIP = @zip@ -TAR = @tar@ -RPM = @rpm@ -RPMBUILD= @rpmbuild@ -MSGFMT = @msgfmt@ +CC = @cc@ +LD = @ld@ +AWK = @awk@ +SED = @sed@ +TAR = @tar@ +ZIP = @zip@ +MAKE = @make@ +ECHO = @echo@ +LN_S = @LN_S@ +LIBTOOL = @LIBTOOL@ +MAKEDEPEND = @makedepend@ -RPM_VERSION = @rpm_version@ -HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ -MAKEDEPEND = @makedepend@ +MSGFMT = @msgfmt@ +MSGMERGE = @msgmerge@ +XGETTEXT = @xgettext@ --omit-header --language=C --keyword=_ + +RPM = @rpm@ +RPMBUILD = @rpmbuild@ +RPM_VERSION = @rpm_version@ -LIBTOOL = @LIBTOOL@ ENABLE_SHARED = @enable_shared@ +ENABLE_GETTEXT = @enable_gettext@ +HAVE_ZIPPED_MANPAGES = @have_zipped_manpages@ + +ifeq ($(PKG_PLATFORM),linux) +PCFLAGS = -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 +endif + +GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall -I$(TOPDIR)/include \ + -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\" \ + -DPACKAGE=\"$(PKG_NAME)\" -CFLAGS += $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall \ - -D_GNU_SOURCE $(LCFLAGS) -I$(TOPDIR)/include \ - -DVERSION=\"$(PKG_VERSION)\" -D_FILE_OFFSET_BITS=64 +# Global, Platform, Local CFLAGS +CFLAGS += $(GCFLAGS) $(PCFLAGS) $(LCFLAGS) include $(TOPDIR)/include/buildmacros diff --git a/include/buildmacros b/include/buildmacros index 33b780c..b9210af 100644 --- a/include/buildmacros +++ b/include/buildmacros @@ -42,8 +42,12 @@ LDLIBS = $(LLDLIBS) $(MALLOCLIB) MAKEOPTS = --no-print-directory SRCFILES = Makefile $(HFILES) $(CFILES) $(LSRCFILES) $(LFILES) $(YFILES) -DIRT = $(LDIRT) dep dep.bak $(OBJECTS) $(LTOBJECTS) *.[1-9].gz \ - $(LTCOMMAND) $(LTLIBRARY) + +DEPDIRT = dep dep.bak +MANDIRT = *.[1-9].gz +PODIRT = *.tmpo *.mo +CDIRT = $(OBJECTS) $(LTOBJECTS) $(LTCOMMAND) $(LTLIBRARY) +DIRT = $(LDIRT) $(DEPDIRT) $(MANDIRT) $(PODIRT) $(CDIRT) OBJECTS = $(ASFILES:.s=.o) \ $(CFILES:.c=.o) \ @@ -137,6 +141,15 @@ INSTALL_MAN = \ done; \ done +ifeq ($(ENABLE_GETTEXT),yes) +INSTALL_LINGUAS = \ + @for l in $(LINGUAS); do \ + ldir=$(PKG_LOCALE_DIR)/$$l/LC_MESSAGES; \ + $(INSTALL) -m 755 -d $$ldir; \ + $(INSTALL) -m 644 $$l.mo $$ldir/$(PKG_NAME).mo; \ + done +endif + SUBDIRS_MAKERULE = \ @for d in $(SUBDIRS) ""; do \ if test -d "$$d" -a ! -z "$$d"; then \ diff --git a/include/buildrules b/include/buildrules index a6a0116..6e186a7 100644 --- a/include/buildrules +++ b/include/buildrules @@ -55,6 +55,17 @@ $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS) $(LTCOMPILE) -c $< endif +ifdef LINGUAS +%.pot: $(XGETTEXTFILES) + $(XGETTEXT) -o $@ $(XGETTEXTFILES) + +%.tmpo: %.po + $(MSGMERGE) -o $@ $< $(PKG_NAME).pot + +%.mo: %.tmpo + $(MSGFMT) -o $@ $< +endif + source : $(SOURCE_MAKERULE) diff --git a/include/config.h.in b/include/config.h.in new file mode 100644 index 0000000..df88619 --- /dev/null +++ b/include/config.h.in @@ -0,0 +1,49 @@ +/* + * Copyright (c) 2002 Silicon Graphics, Inc. All Rights Reserved. + * + * This program is free software; you can redistribute it and/or modify it + * under the terms of version 2 of the GNU General Public License as + * published by the Free Software Foundation. + * + * This program is distributed in the hope that it would be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + * + * Further, this software is distributed without any warranty that it is + * free of the rightful claim of any third person regarding infringement + * or the like. Any license provided herein, whether implied or + * otherwise, applies only to this software file. Patent licenses, if + * any, provided herein do not apply to combinations of this program with + * other software, or any other product whatsoever. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write the Free Software Foundation, Inc., 59 + * Temple Place - Suite 330, Boston MA 02111-1307, USA. + * + * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, + * Mountain View, CA 94043, or: + * + * http://www.sgi.com + * + * For further information regarding this notice, see: + * + * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ + * + * @configure_input@ + */ +#ifndef __CONFIG_H__ +#define __CONFIG_H__ + +/* Define if you want gettext (I18N) support */ +#undef ENABLE_GETTEXT + +#ifdef ENABLE_GETTEXT +# include <libintl.h> +# define _(x) gettext(x) +#else +# define _(x) (x) +# define textdomain(d) do { } while (0) +# define bindtextdomain(d,dir) do { } while (0) +#endif + +#endif /* __CONFIG_H__ */ diff --git a/po/Makefile b/po/Makefile new file mode 100644 index 0000000..9033e4d --- /dev/null +++ b/po/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (c) 2001-2002 Silicon Graphics, Inc. All Rights Reserved. +# +# This program is free software; you can redistribute it and/or modify it +# under the terms of version 2 of the GNU General Public License as +# published by the Free Software Foundation. +# +# This program is distributed in the hope that it would be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. +# +# Further, this software is distributed without any warranty that it is +# free of the rightful claim of any third person regarding infringement +# or the like. Any license provided herein, whether implied or +# otherwise, applies only to this software file. Patent licenses, if +# any, provided herein do not apply to combinations of this program with +# other software, or any other product whatsoever. +# +# You should have received a copy of the GNU General Public License along +# with this program; if not, write the Free Software Foundation, Inc., 59 +# Temple Place - Suite 330, Boston MA 02111-1307, USA. +# +# Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy, +# Mountain View, CA 94043, or: +# +# http://www.sgi.com +# +# For further information regarding this notice, see: +# +# http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/ +# + +TOPDIR = .. +include $(TOPDIR)/include/builddefs + +# Currently LINGUAS is undefined, so buildmacros provides no targets. +LINGUAS = +LSRCFILES = $(LINGUAS:%=%.po) $(PKG_NAME).pot + +XGETTEXTFILES = $(TOPDIR)/attr/attr.c \ + $(TOPDIR)/getfattr/getfattr.c \ + $(TOPDIR)/setfattr/setfattr.c + +default: $(LINGUAS:%=%.mo) + +include $(BUILDRULES) + +install: default + $(INSTALL_LINGUAS) + +install-dev install-lib: diff --git a/po/attr.pot b/po/attr.pot new file mode 100644 index 0000000..1e3822f --- /dev/null +++ b/po/attr.pot @@ -0,0 +1,105 @@ +#, c-format +msgid "" +"Usage: %s [-LRq] -s attrname [-V attrvalue] pathname # set value\n" +" %s [-LRq] -g attrname pathname # get value\n" +" %s [-LRq] -r attrname pathname # remove attr\n" +" -s reads a value from stdin and -g writes a value to stdout\n" +msgstr "" + +msgid "Only one of -s, -g, or -r allowed\n" +msgstr "" + +msgid "-V only allowed with -s\n" +msgstr "" + +#, c-format +msgid "Unrecognized option: %c\n" +msgstr "" + +msgid "A filename to operate on is required\n" +msgstr "" + +#, c-format +msgid "Could not set \"%s\" for %s\n" +msgstr "" + +#, c-format +msgid "Attribute \"%s\" set to a %d byte value for %s:\n" +msgstr "" + +#, c-format +msgid "Could not get \"%s\" for %s\n" +msgstr "" + +#, c-format +msgid "Attribute \"%s\" had a %d byte value for %s:\n" +msgstr "" + +#, c-format +msgid "Could not remove \"%s\" for %s\n" +msgstr "" + +msgid "At least one of -s, -g, or -r is required\n" +msgstr "" + +msgid "No such attribute" +msgstr "" + +#, c-format +msgid "%s: Removing leading '/' from absolute path names\n" +msgstr "" + +#, c-format +msgid "%s %s -- get extended attributes\n" +msgstr "" + +#, c-format +msgid "Usage: %s %s\n" +msgstr "" + +msgid "" +" -n, --name=name get the named extended attribute value\n" +" -d, --dump get all extended attribute values\n" +" -e, --encoding=... encode values (as 'text', 'hex' or 'base64')\n" +" --match=pattern only get attributes with names matching pattern\n" +" --only-values print the bare values only\n" +" -h, --no-dereference do not dereference symbolic links\n" +" --absolute-names don't strip leading '/' in pathnames\n" +" -R, --recursive recurse into subdirectories\n" +" -L, --logical logical walk, follow symbolic links\n" +" -P --physical physical walk, do not follow symbolic links\n" +" --version print version and exit\n" +" --help this help text\n" +msgstr "" + +#, c-format +msgid "%s: invalid regular expression \"%s\"\n" +msgstr "" + +#, c-format +msgid "" +"Usage: %s %s\n" +"Try `%s --help' for more information.\n" +msgstr "" + +#, c-format +msgid "%s: %s: No filename found in line %d, aborting\n" +msgstr "" + +#, c-format +msgid "%s: No filename found inline %d of standard input, aborting\n" +msgstr "" + +#, c-format +msgid "%s %s -- set extended attributes\n" +msgstr "" + +msgid "" +" -n, --name=name set the value of the named extended attribute\n" +" -x, --remove=name remove the named extended attribute\n" +" -v, --value=value use value as the attribute value\n" +" -h, --no-dereference do not dereference symbolic links\n" +" --restore=file restore extended attributes\n" +" --version print version and exit\n" +" --help this help text\n" +msgstr "" diff --git a/setfattr/setfattr.c b/setfattr/setfattr.c index a933cb8..a70a2cf 100644 --- a/setfattr/setfattr.c +++ b/setfattr/setfattr.c @@ -25,13 +25,11 @@ #include <stdlib.h> #include <string.h> #include <getopt.h> +#include <locale.h> #include <ctype.h> #include <attr/xattr.h> - -#include <locale.h> -#include <libintl.h> -#define _(String) gettext (String) +#include "config.h" #define CMD_LINE_OPTIONS "n:x:v:h" #define CMD_LINE_SPEC "{-n name|-x name} [-v value] [-h] file..." @@ -186,6 +184,10 @@ int main(int argc, char *argv[]) progname = basename(argv[0]); + setlocale(LC_CTYPE, ""); + bindtextdomain(PACKAGE, LOCALEDIR); + textdomain(PACKAGE); + while ((opt = getopt_long(argc, argv, CMD_LINE_OPTIONS, long_options, NULL)) != -1) { switch(opt) { |