From 97be4a37e327108e2d95ca832e71f6eda1e2d908 Mon Sep 17 00:00:00 2001 From: Davidlohr Bueso Date: Mon, 15 Nov 2010 08:55:16 -0300 Subject: lib/tt: fix langinfo build break MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When HAVE_LANGINFO_H is not defined we break the compilation in tt.c: CC tt.o tt.c: In function ‘tt_new_table’: tt.c:142: warning: implicit declaration of function ‘nl_langinfo’ tt.c:142: error: ‘CODESET’ undeclared (first use in this function) tt.c:142: error: (Each undeclared identifier is reported only once tt.c:142: error: for each function it appears in.) make: *** [tt.o] Error 1 Signed-off-by: Davidlohr Bueso --- lib/tt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/tt.c b/lib/tt.c index 7d87bf54..d3436e10 100644 --- a/lib/tt.c +++ b/lib/tt.c @@ -138,7 +138,7 @@ struct tt *tt_new_table(int flags) INIT_LIST_HEAD(&tb->tb_lines); INIT_LIST_HEAD(&tb->tb_columns); -#ifdef HAVE_WIDECHAR +#if defined(HAVE_WIDECHAR) && defined(HAVE_LANGINFO_H) if (!(flags & TT_FL_ASCII) && !strcmp(nl_langinfo(CODESET), "UTF-8")) tb->symbols = &utf8_tt_symbols; else -- cgit v1.2.3 From dc61d398ba14a38f13aeab3be9e9e09f7f117179 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 15 Nov 2010 16:42:45 +0100 Subject: lib: add fallback for nl_langinfo() The fallback ignores locales and returns hardcoded static strings. It should be enough to include "nls.h" to work with nl_langinfo() on all systems. Signed-off-by: Karel Zak --- configure.ac | 7 +++- include/nls.h | 73 ++++++++++++++++++++++++++++++++++ lib/langinfo.c | 121 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 200 insertions(+), 1 deletion(-) create mode 100644 lib/langinfo.c (limited to 'lib') diff --git a/configure.ac b/configure.ac index 561424a6..ca3e4af5 100644 --- a/configure.ac +++ b/configure.ac @@ -110,7 +110,6 @@ AC_CHECK_HEADERS( [err.h \ errno.h \ getopt.h \ - langinfo.h \ linux/fd.h \ linux/tiocl.h \ linux/version.h \ @@ -146,10 +145,16 @@ AC_CHECK_HEADERS( sys/user.h \ sys/resource.h \ unistd.h ]) + AC_CHECK_HEADERS([linux/raw.h], [AM_CONDITIONAL([HAVE_RAW], [true])], [AM_CONDITIONAL([HAVE_RAW], [false])]) +AC_CHECK_HEADERS([langinfo.h], + [AM_CONDITIONAL([HAVE_LANGINFO], [true])], + [AM_CONDITIONAL([HAVE_LANGINFO], [false])]) + + AC_CHECK_DECLS([_NL_TIME_WEEK_1STDAY],[],[],[[#include ]]) AC_CHECK_DECL([llseek], diff --git a/include/nls.h b/include/nls.h index dd0440c9..00f2e37a 100644 --- a/include/nls.h +++ b/include/nls.h @@ -31,4 +31,77 @@ int main(int argc, char *argv[]); # define N_(Text) (Text) #endif +#ifdef HAVE_LANGINFO_H +# include +#else + +typedef int nl_item; +extern char *langinfo_fallback(nl_item item); + +# define nl_langinfo langinfo_fallback + +enum { + CODESET = 1, + RADIXCHAR, + THOUSEP, + D_T_FMT, + D_FMT, + T_FMT, + T_FMT_AMPM, + AM_STR, + PM_STR, + + DAY_1, + DAY_2, + DAY_3, + DAY_4, + DAY_5, + DAY_6, + DAY_7, + + ABDAY_1, + ABDAY_2, + ABDAY_3, + ABDAY_4, + ABDAY_5, + ABDAY_6, + ABDAY_7, + + MON_1, + MON_2, + MON_3, + MON_4, + MON_5, + MON_6, + MON_7, + MON_8, + MON_9, + MON_10, + MON_11, + MON_12, + + ABMON_1, + ABMON_2, + ABMON_3, + ABMON_4, + ABMON_5, + ABMON_6, + ABMON_7, + ABMON_8, + ABMON_9, + ABMON_10, + ABMON_11, + ABMON_12, + + ERA_D_FMT, + ERA_D_T_FMT, + ERA_T_FMT, + ALT_DIGITS, + CRNCYSTR, + YESEXPR, + NOEXPR +}; + +#endif /* !HAVE_LANGINFO_H */ + #endif /* UTIL_LINUX_NLS_H */ diff --git a/lib/langinfo.c b/lib/langinfo.c new file mode 100644 index 00000000..deeab9b1 --- /dev/null +++ b/lib/langinfo.c @@ -0,0 +1,121 @@ +/* + * This is callback solution for systems without nl_langinfo(), this function + * returns hardcoded and on locale setting independed value. + * + * See langinfo.h man page for more details. + * + * Copyright (C) 2010 Karel Zak + */ +#include "nls.h" + +char *langinfo_fallback(nl_item item) +{ + switch (item) { + case CODESET: + return "ISO-8859-1"; + case THOUSEP: + return ","; + case D_T_FMT: + case ERA_D_T_FMT: + return "%a %b %e %H:%M:%S %Y"; + case D_FMT: + case ERA_D_FMT: + return "%m/%d/%y"; + case T_FMT: + case ERA_T_FMT: + return "%H:%M:%S"; + case T_FMT_AMPM: + return "%I:%M:%S %p"; + case AM_STR: + return "AM"; + case PM_STR: + return "PM"; + case DAY_1: + return "Sunday"; + case DAY_2: + return "Monday"; + case DAY_3: + return "Tuesday"; + case DAY_4: + return "Wednesday"; + case DAY_5: + return "Thursday"; + case DAY_6: + return "Friday"; + case DAY_7: + return "Saturday"; + case ABDAY_1: + return "Sun"; + case ABDAY_2: + return "Mon"; + case ABDAY_3: + return "Tue"; + case ABDAY_4: + return "Wed"; + case ABDAY_5: + return "Thu"; + case ABDAY_6: + return "Fri"; + case ABDAY_7: + return "Sat"; + case MON_1: + return "January"; + case MON_2: + return "February"; + case MON_3: + return "March"; + case MON_4: + return "April"; + case MON_5: + return "May"; + case MON_6: + return "June"; + case MON_7: + return "July"; + case MON_8: + return "August"; + case MON_9: + return "September"; + case MON_10: + return "October"; + case MON_11: + return "November"; + case MON_12: + return "December"; + case ABMON_1: + return "Jan"; + case ABMON_2: + return "Feb"; + case ABMON_3: + return "Mar"; + case ABMON_4: + return "Apr"; + case ABMON_5: + return "May"; + case ABMON_6: + return "Jun"; + case ABMON_7: + return "Jul"; + case ABMON_8: + return "Aug"; + case ABMON_9: + return "Sep"; + case ABMON_10: + return "Oct"; + case ABMON_11: + return "Nov"; + case ABMON_12: + return "Dec"; + case ALT_DIGITS: + return "\0\0\0\0\0\0\0\0\0\0"; + case CRNCYSTR: + return "-"; + case YESEXPR: + return "^[yY]"; + case NOEXPR: + return "^[nN]"; + default: + return ""; + } +} + -- cgit v1.2.3 From f7a29259ee46b1065ca3ba36f921fecfcbb6fdc6 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Mon, 15 Nov 2010 16:47:13 +0100 Subject: findmnt: follow HAVE_LANGINFO Signed-off-by: Karel Zak --- lib/tt.c | 5 +---- misc-utils/Makefile.am | 3 +++ misc-utils/findmnt.c | 3 --- 3 files changed, 4 insertions(+), 7 deletions(-) (limited to 'lib') diff --git a/lib/tt.c b/lib/tt.c index d3436e10..a4aabfe0 100644 --- a/lib/tt.c +++ b/lib/tt.c @@ -15,9 +15,6 @@ #include #include #include -#ifdef HAVE_LANGINFO_H -#include -#endif #ifdef HAVE_SYS_IOCTL_H #include #endif @@ -138,7 +135,7 @@ struct tt *tt_new_table(int flags) INIT_LIST_HEAD(&tb->tb_lines); INIT_LIST_HEAD(&tb->tb_columns); -#if defined(HAVE_WIDECHAR) && defined(HAVE_LANGINFO_H) +#if defined(HAVE_WIDECHAR) if (!(flags & TT_FL_ASCII) && !strcmp(nl_langinfo(CODESET), "UTF-8")) tb->symbols = &utf8_tt_symbols; else diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 6a16f999..794b8818 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -60,6 +60,9 @@ dist_man_MANS += findmnt.8 findmnt_LDADD = $(ul_libmount_la) findmnt_CFLAGS = $(AM_CFLAGS) -I$(ul_libmount_incdir) findmnt_SOURCES = findmnt.c $(top_srcdir)/lib/tt.c +if !HAVE_LANGINFO +findmnt_SOURCES += $(top_srcdir)/lib/langinfo.c +endif endif cal_SOURCES = cal.c $(top_srcdir)/lib/mbsalign.c diff --git a/misc-utils/findmnt.c b/misc-utils/findmnt.c index b1fb90a4..0e3cc376 100644 --- a/misc-utils/findmnt.c +++ b/misc-utils/findmnt.c @@ -26,9 +26,6 @@ #include #include #include -#ifdef HAVE_LANGINFO_H -#include -#endif #ifdef HAVE_SYS_IOCTL_H #include #endif -- cgit v1.2.3 From 8abcf2900297c6d53ead867c42f7c1688e8d52ca Mon Sep 17 00:00:00 2001 From: Davidlohr Bueso Date: Tue, 16 Nov 2010 10:47:35 -0300 Subject: lib: [strutils] general purpose string handling functions This patch replaces a few functions used throughout the source: * Renames getnum (from schedutils) to strtol_or_err * Moves strtosize (from lib/strtosize.c) * Moves xstrncpy (from include/xstrncpy.h) * Adds strnlen, strnchr and strndup if not available (remove it from libmount utils) A few Makefile.am files were modified to compile accordingly along with trivial renaming in schedutils source code. Signed-off-by: Davidlohr Bueso --- disk-utils/mkswap.c | 2 +- disk-utils/swaplabel.c | 2 +- fdisk/cfdisk.c | 2 +- include/Makefile.am | 5 +- include/strtosize.h | 8 -- include/strutils.h | 26 +++++++ include/xstrncpy.h | 8 -- lib/Makefile.am | 3 +- lib/strtosize.c | 148 ------------------------------------ lib/strutils.c | 186 ++++++++++++++++++++++++++++++++++++++++++++++ login-utils/agetty.c | 2 +- login-utils/checktty.c | 2 +- login-utils/chfn.c | 2 +- login-utils/login.c | 2 +- login-utils/shutdown.c | 2 +- login-utils/simpleinit.c | 2 +- login-utils/vipw.c | 2 +- login-utils/wall.c | 2 +- misc-utils/Makefile.am | 4 +- misc-utils/blkid.c | 2 +- misc-utils/wipefs.c | 2 +- mount/Makefile.am | 6 +- mount/lomount.c | 4 +- mount/mount.c | 2 +- mount/umount.c | 2 +- schedutils/Makefile.am | 2 +- schedutils/chrt.c | 6 +- schedutils/ionice.c | 12 +-- schedutils/schedutils.c | 34 --------- schedutils/schedutils.h | 7 -- schedutils/taskset.c | 4 +- shlibs/mount/src/mountP.h | 9 --- shlibs/mount/src/utils.c | 39 ---------- sys-utils/Makefile.am | 2 +- sys-utils/fallocate.c | 2 +- text-utils/more.c | 2 +- 36 files changed, 252 insertions(+), 295 deletions(-) delete mode 100644 include/strtosize.h create mode 100644 include/strutils.h delete mode 100644 include/xstrncpy.h delete mode 100644 lib/strtosize.c create mode 100644 lib/strutils.c delete mode 100644 schedutils/schedutils.c delete mode 100644 schedutils/schedutils.h (limited to 'lib') diff --git a/disk-utils/mkswap.c b/disk-utils/mkswap.c index 246b8dd7..3d14a42e 100644 --- a/disk-utils/mkswap.c +++ b/disk-utils/mkswap.c @@ -48,7 +48,7 @@ #include "linux_version.h" #include "swapheader.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "blkdev.h" #include "pathnames.h" diff --git a/disk-utils/swaplabel.c b/disk-utils/swaplabel.c index 63419722..9dc20b49 100644 --- a/disk-utils/swaplabel.c +++ b/disk-utils/swaplabel.c @@ -33,7 +33,7 @@ #include "c.h" #include "writeall.h" #include "swapheader.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #define SWAP_UUID_OFFSET (offsetof(struct swap_header_v1_2, uuid)) diff --git a/fdisk/cfdisk.c b/fdisk/cfdisk.c index 149a6166..1e078a9f 100644 --- a/fdisk/cfdisk.c +++ b/fdisk/cfdisk.c @@ -99,7 +99,7 @@ #include "nls.h" #include "blkdev.h" -#include "xstrncpy.h" +#include "strutils.h" #include "common.h" #include "gpt.h" #include "mbsalign.h" diff --git a/include/Makefile.am b/include/Makefile.am index 3b93acd0..c7b3c20d 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -20,11 +20,10 @@ dist_noinst_HEADERS = \ nls.h \ pathnames.h \ setproctitle.h \ - strtosize.h \ + strutils.h \ swapheader.h \ tt.h \ usleep.h \ wholedisk.h \ widechar.h \ - writeall.h \ - xstrncpy.h + writeall.h diff --git a/include/strtosize.h b/include/strtosize.h deleted file mode 100644 index c789df93..00000000 --- a/include/strtosize.h +++ /dev/null @@ -1,8 +0,0 @@ -#ifndef UTIL_LINUX_STRTOSIZE -#define UTIL_LINUX_STRTOSIZE - -#include - -extern int strtosize(const char *str, uintmax_t *res); - -#endif /* UTIL_LINUX_STRING_TO_NUMBE */ diff --git a/include/strutils.h b/include/strutils.h new file mode 100644 index 00000000..e24496d3 --- /dev/null +++ b/include/strutils.h @@ -0,0 +1,26 @@ +#ifndef UTIL_LINUX_STRUTILS +#define UTIL_LINUX_STRUTILS + +#include +#include + +extern int strtosize(const char *str, uintmax_t *res); +extern long strtol_or_err(const char *str, const char *errmesg); + +#ifndef HAVE_STRNLEN +extern size_t strnlen(const char *s, size_t maxlen); +#endif +#ifndef HAVE_STRNDUP +extern char *strndup(const char *s, size_t n); +#endif +#ifndef HAVE_STRNCHR +extern char *strnchr(const char *s, size_t maxlen, int c); +#endif + +/* caller guarantees n > 0 */ +static inline void xstrncpy(char *dest, const char *src, size_t n) +{ + strncpy(dest, src, n-1); + dest[n-1] = 0; +} +#endif diff --git a/include/xstrncpy.h b/include/xstrncpy.h deleted file mode 100644 index 7ed4109d..00000000 --- a/include/xstrncpy.h +++ /dev/null @@ -1,8 +0,0 @@ -/* NUL-terminated version of strncpy() */ -#include - -/* caller guarantees n > 0 */ -static inline void xstrncpy(char *dest, const char *src, size_t n) { - strncpy(dest, src, n-1); - dest[n-1] = 0; -} diff --git a/lib/Makefile.am b/lib/Makefile.am index 45d319d3..9a3bf35b 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -3,7 +3,7 @@ include $(top_srcdir)/config/include-Makefile.am AM_CPPFLAGS += -DTEST_PROGRAM noinst_PROGRAMS = test_blkdev test_ismounted test_wholedisk test_mangle \ - test_strtosize test_tt test_canonicalize + test_tt test_canonicalize if LINUX if HAVE_CPU_SET_T noinst_PROGRAMS += test_cpuset @@ -14,7 +14,6 @@ test_blkdev_SOURCES = blkdev.c test_ismounted_SOURCES = ismounted.c test_wholedisk_SOURCES = wholedisk.c test_mangle_SOURCES = mangle.c -test_strtosize_SOURCES = strtosize.c if LINUX test_cpuset_SOURCES = cpuset.c endif diff --git a/lib/strtosize.c b/lib/strtosize.c deleted file mode 100644 index 068c5429..00000000 --- a/lib/strtosize.c +++ /dev/null @@ -1,148 +0,0 @@ -/* - * strtosize() - convert string to size (uintmax_t). - * - * Supported suffixes: - * - * XiB or X for 2^N - * where X = {K,M,G,T,P,E,Y,Z} - * or X = {k,m,g,t,p,e} (undocumented for backward compatibility only) - * for example: - * 10KiB = 10240 - * 10K = 10240 - * - * XB for 10^N - * where X = {K,M,G,T,P,E,Y,Z} - * for example: - * 10KB = 10000 - * - * Note that the function does not accept numbers with '-' (negative sign) - * prefix. - * - * Returns 0 on success, -1 in case of error, -2 in case of overflow. - * - * Copyright (C) 2010 Karel Zak - */ -#include -#include -#include -#include - -static int do_scale_by_power (uintmax_t *x, int base, int power) -{ - while (power--) { - if (UINTMAX_MAX / base < *x) - return -2; - *x *= base; - } - return 0; -} - -int strtosize(const char *str, uintmax_t *res) -{ - char *p; - uintmax_t x; - int base = 1024, rc = 0; - - *res = 0; - - if (!str || !*str) - goto err; - - /* Only positive numbers are acceptable - * - * Note that this check is not perfect, it would be better to - * use lconv->negative_sign. But coreutils use the same solution, - * so it's probably good enough... - */ - p = (char *) str; - while (isspace((unsigned char) *p)) - p++; - if (*p == '-') - goto err; - p = NULL; - - errno = 0; - x = strtoumax(str, &p, 0); - - if (p == str || - (errno != 0 && (x == UINTMAX_MAX || x == 0))) - goto err; - - if (!p || !*p) - goto done; /* without suffix */ - - /* - * Check size suffixes - */ - if (*(p + 1) == 'i' && *(p + 2) == 'B' && !*(p + 3)) - base = 1024; /* XiB, 2^N */ - else if (*(p + 1) == 'B' && !*(p + 2)) - base = 1000; /* XB, 10^N */ - else if (*(p + 1)) - goto err; /* unexpected suffix */ - - switch(*p) { - case 'K': - case 'k': - rc = do_scale_by_power(&x, base, 1); - break; - case 'M': - case 'm': - rc = do_scale_by_power(&x, base, 2); - break; - case 'G': - case 'g': - rc = do_scale_by_power(&x, base, 3); - break; - case 'T': - case 't': - rc = do_scale_by_power(&x, base, 4); - break; - case 'P': - case 'p': - rc = do_scale_by_power(&x, base, 5); - break; - case 'E': - case 'e': - rc = do_scale_by_power(&x, base, 6); - break; - case 'Z': - rc = do_scale_by_power(&x, base, 7); - break; - case 'Y': - rc = do_scale_by_power(&x, base, 8); - break; - default: - goto err; - } - -done: - *res = x; - return rc; -err: - return -1; -} - -#ifdef TEST_PROGRAM - -#include -#include -#include - -int main(int argc, char *argv[]) -{ - uintmax_t size = 0; - - if (argc < 2) { - fprintf(stderr, "usage: %s [suffix]\n", argv[0]); - exit(EXIT_FAILURE); - } - - if (strtosize(argv[1], &size)) - errx(EXIT_FAILURE, "invalid size '%s' value", argv[1]); - - printf("%25s : %20ju\n", argv[1], size); - return EXIT_FAILURE; -} -#endif /* TEST_PROGRAM */ - diff --git a/lib/strutils.c b/lib/strutils.c new file mode 100644 index 00000000..f394800d --- /dev/null +++ b/lib/strutils.c @@ -0,0 +1,186 @@ +/* + * Copyright (C) 2010 Karel Zak + * Copyright (C) 2010 Davidlohr Bueso + */ + +#include +#include +#include +#include +#include + +static int do_scale_by_power (uintmax_t *x, int base, int power) +{ + while (power--) { + if (UINTMAX_MAX / base < *x) + return -2; + *x *= base; + } + return 0; +} + +/* + * strtosize() - convert string to size (uintmax_t). + * + * Supported suffixes: + * + * XiB or X for 2^N + * where X = {K,M,G,T,P,E,Y,Z} + * or X = {k,m,g,t,p,e} (undocumented for backward compatibility only) + * for example: + * 10KiB = 10240 + * 10K = 10240 + * + * XB for 10^N + * where X = {K,M,G,T,P,E,Y,Z} + * for example: + * 10KB = 10000 + * + * Note that the function does not accept numbers with '-' (negative sign) + * prefix. + */ +int strtosize(const char *str, uintmax_t *res) +{ + char *p; + uintmax_t x; + int base = 1024, rc = 0; + + *res = 0; + + if (!str || !*str) + goto err; + + /* Only positive numbers are acceptable + * + * Note that this check is not perfect, it would be better to + * use lconv->negative_sign. But coreutils use the same solution, + * so it's probably good enough... + */ + p = (char *) str; + while (isspace((unsigned char) *p)) + p++; + if (*p == '-') + goto err; + p = NULL; + + errno = 0; + x = strtoumax(str, &p, 0); + + if (p == str || + (errno != 0 && (x == UINTMAX_MAX || x == 0))) + goto err; + + if (!p || !*p) + goto done; /* without suffix */ + + /* + * Check size suffixes + */ + if (*(p + 1) == 'i' && *(p + 2) == 'B' && !*(p + 3)) + base = 1024; /* XiB, 2^N */ + else if (*(p + 1) == 'B' && !*(p + 2)) + base = 1000; /* XB, 10^N */ + else if (*(p + 1)) + goto err; /* unexpected suffix */ + + switch(*p) { + case 'K': + case 'k': + rc = do_scale_by_power(&x, base, 1); + break; + case 'M': + case 'm': + rc = do_scale_by_power(&x, base, 2); + break; + case 'G': + case 'g': + rc = do_scale_by_power(&x, base, 3); + break; + case 'T': + case 't': + rc = do_scale_by_power(&x, base, 4); + break; + case 'P': + case 'p': + rc = do_scale_by_power(&x, base, 5); + break; + case 'E': + case 'e': + rc = do_scale_by_power(&x, base, 6); + break; + case 'Z': + rc = do_scale_by_power(&x, base, 7); + break; + case 'Y': + rc = do_scale_by_power(&x, base, 8); + break; + default: + goto err; + } + +done: + *res = x; + return rc; +err: + return -1; +} + +#ifndef HAVE_STRNLEN +size_t strnlen(const char *s, size_t maxlen) +{ + int i; + + for (i = 0; i < maxlen; i++) { + if (s[i] == '\0') + return i + 1; + } + return maxlen; +} +#endif + +#ifndef HAVE_STRNCHR +char *strnchr(const char *s, size_t maxlen, int c) +{ + for (; maxlen-- && *s != '\0'; ++s) + if (*s == (char)c) + return (char *)s; + return NULL; +} +#endif + +#ifndef HAVE_STRNDUP +char *strndup(const char *s, size_t n) +{ + size_t len = strnlen(s, n); + char *new = (char *) malloc((len + 1) * sizeof(char)); + if (!new) + return NULL; + new[len] = '\0'; + return (char *) memcpy(new, s, len); +} +#endif + +/* + * same as strtol(3) but exit on failure instead of returning crap + */ +long strtol_or_err(const char *str, const char *errmesg) +{ + long num; + char *end = NULL; + + if (str == NULL || *str == '\0') + goto err; + errno = 0; + num = strtol(str, &end, 10); + + if (errno || (end && *end)) + goto err; + + return num; +err: + if (errno) + err(EXIT_FAILURE, "%s: '%s'", errmesg, str); + else + errx(EXIT_FAILURE, "%s: '%s'", errmesg, str); + return 0; +} diff --git a/login-utils/agetty.c b/login-utils/agetty.c index f048c3e4..b1cfa5a5 100644 --- a/login-utils/agetty.c +++ b/login-utils/agetty.c @@ -32,7 +32,7 @@ #include #include -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "pathnames.h" diff --git a/login-utils/checktty.c b/login-utils/checktty.c index c28ee833..92bebfb7 100644 --- a/login-utils/checktty.c +++ b/login-utils/checktty.c @@ -31,7 +31,7 @@ #include "pathnames.h" #include "login.h" -#include "xstrncpy.h" +#include "strutils.h" #ifndef TTY_MAJOR #define TTY_MAJOR 4 diff --git a/login-utils/chfn.c b/login-utils/chfn.c index 691c4f6f..ef0a746d 100644 --- a/login-utils/chfn.c +++ b/login-utils/chfn.c @@ -36,7 +36,7 @@ #include "my_crypt.h" #include "islocal.h" #include "setpwnam.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "env.h" diff --git a/login-utils/login.c b/login-utils/login.c index 1550388c..68eb84bc 100644 --- a/login-utils/login.c +++ b/login-utils/login.c @@ -113,7 +113,7 @@ #include "pathnames.h" #include "my_crypt.h" #include "login.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" diff --git a/login-utils/shutdown.c b/login-utils/shutdown.c index 0078df2d..172113c7 100644 --- a/login-utils/shutdown.c +++ b/login-utils/shutdown.c @@ -74,7 +74,7 @@ #include #include "linux_reboot.h" #include "pathnames.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "usleep.h" diff --git a/login-utils/simpleinit.c b/login-utils/simpleinit.c index 8cff848c..9277a3cc 100644 --- a/login-utils/simpleinit.c +++ b/login-utils/simpleinit.c @@ -45,7 +45,7 @@ #include "my_crypt.h" #include "pathnames.h" #include "linux_reboot.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "simpleinit.h" diff --git a/login-utils/vipw.c b/login-utils/vipw.c index b3972f3b..e7247e42 100644 --- a/login-utils/vipw.c +++ b/login-utils/vipw.c @@ -64,7 +64,7 @@ static char version_string[] = "vipw 1.4"; #include #include "setpwnam.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #ifdef HAVE_LIBSELINUX diff --git a/login-utils/wall.c b/login-utils/wall.c index 7b5f6718..38c54426 100644 --- a/login-utils/wall.c +++ b/login-utils/wall.c @@ -58,7 +58,7 @@ #include #include "nls.h" -#include "xstrncpy.h" +#include "strutils.h" #include "ttymsg.h" #include "pathnames.h" #include "carefulputc.h" diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index aed8bac8..76b69fa4 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -37,12 +37,12 @@ if BUILD_LIBBLKID sbin_PROGRAMS += blkid findfs wipefs dist_man_MANS += blkid.8 findfs.8 wipefs.8 blkid_SOURCES = blkid.c $(top_srcdir)/lib/ismounted.c \ - $(top_srcdir)/lib/strtosize.c + $(top_srcdir)/lib/strutils.c blkid_LDADD = $(ul_libblkid_la) blkid_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) findfs_LDADD = $(ul_libblkid_la) findfs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) -wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strtosize.c +wipefs_SOURCES = wipefs.c $(top_srcdir)/lib/strutils.c wipefs_LDADD = $(ul_libblkid_la) wipefs_CFLAGS = $(AM_CFLAGS) -I$(ul_libblkid_incdir) if HAVE_STATIC_BLKID diff --git a/misc-utils/blkid.c b/misc-utils/blkid.c index f94df06a..2f7860fd 100644 --- a/misc-utils/blkid.c +++ b/misc-utils/blkid.c @@ -41,7 +41,7 @@ extern int optind; #include #include "ismounted.h" -#include "strtosize.h" +#include "strutils.h" const char *progname = "blkid"; diff --git a/misc-utils/wipefs.c b/misc-utils/wipefs.c index dbfabc4a..2f223f0c 100644 --- a/misc-utils/wipefs.c +++ b/misc-utils/wipefs.c @@ -35,7 +35,7 @@ #include "nls.h" #include "xalloc.h" -#include "strtosize.h" +#include "strutils.h" struct wipe_desc { loff_t offset; /* magic string offset */ diff --git a/mount/Makefile.am b/mount/Makefile.am index 235cceb0..36b06e32 100644 --- a/mount/Makefile.am +++ b/mount/Makefile.am @@ -28,12 +28,12 @@ cflags_common = $(AM_CFLAGS) ldflags_static = -all-static mount_SOURCES = mount.c $(srcs_mount) $(top_srcdir)/lib/setproctitle.c \ - $(top_srcdir)/lib/strtosize.c + $(top_srcdir)/lib/strutils.c mount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) mount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) mount_LDADD = $(ldadd_common) -umount_SOURCES = umount.c $(srcs_mount) $(top_srcdir)/lib/strtosize.c +umount_SOURCES = umount.c $(srcs_mount) $(top_srcdir)/lib/strutils.c umount_CFLAGS = $(SUID_CFLAGS) $(cflags_common) umount_LDFLAGS = $(SUID_LDFLAGS) $(AM_LDFLAGS) umount_LDADD = $(ldadd_common) @@ -45,7 +45,7 @@ swapon_CFLAGS = $(cflags_common) swapon_LDADD = $(ldadd_common) losetup_SOURCES = lomount.c $(srcs_common) loop.h lomount.h \ - $(top_srcdir)/lib/strtosize.c + $(top_srcdir)/lib/strutils.c losetup_CPPFLAGS = -DMAIN $(AM_CPPFLAGS) mount_static_LDADD = diff --git a/mount/lomount.c b/mount/lomount.c index 03aae4b2..d6556fc7 100644 --- a/mount/lomount.c +++ b/mount/lomount.c @@ -18,7 +18,7 @@ #include "loop.h" #include "lomount.h" -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "sundries.h" #include "xmalloc.h" @@ -886,7 +886,7 @@ find_unused_loop_device (void) { #include #include -#include "strtosize.h" +#include "strutils.h" static void usage(FILE *f) { diff --git a/mount/mount.c b/mount/mount.c index c0023f39..9faa6a5b 100644 --- a/mount/mount.c +++ b/mount/mount.c @@ -41,7 +41,7 @@ #include "env.h" #include "nls.h" #include "blkdev.h" -#include "strtosize.h" +#include "strutils.h" #define DO_PS_FIDDLING diff --git a/mount/umount.c b/mount/umount.c index b5ff8a17..6e24779b 100644 --- a/mount/umount.c +++ b/mount/umount.c @@ -20,7 +20,7 @@ #include "fstab.h" #include "env.h" #include "nls.h" -#include "strtosize.h" +#include "strutils.h" #if defined(MNT_FORCE) /* Interesting ... it seems libc knows about MNT_FORCE and presumably diff --git a/schedutils/Makefile.am b/schedutils/Makefile.am index c83e5eaf..dc331753 100644 --- a/schedutils/Makefile.am +++ b/schedutils/Makefile.am @@ -2,7 +2,7 @@ include $(top_srcdir)/config/include-Makefile.am if BUILD_SCHEDUTILS -srcs_common = schedutils.c schedutils.h +srcs_common = $(top_srcdir)/lib/strutils.c usrbin_exec_PROGRAMS = chrt dist_man_MANS = chrt.1 diff --git a/schedutils/chrt.c b/schedutils/chrt.c index 811eb200..bd7070cc 100644 --- a/schedutils/chrt.c +++ b/schedutils/chrt.c @@ -32,7 +32,7 @@ #include "c.h" #include "nls.h" -#include "schedutils.h" +#include "strutils.h" /* the SCHED_BATCH is supported since Linux 2.6.16 * -- temporary workaround for people with old glibc headers @@ -240,7 +240,7 @@ int main(int argc, char *argv[]) break; case 'p': errno = 0; - pid = getnum(argv[argc - 1], _("failed to parse pid")); + pid = strtol_or_err(argv[argc - 1], _("failed to parse pid")); break; case 'r': policy = SCHED_RR; @@ -268,7 +268,7 @@ int main(int argc, char *argv[]) } errno = 0; - priority = getnum(argv[optind], _("failed to parse priority")); + priority = strtol_or_err(argv[optind], _("failed to parse priority")); #ifdef SCHED_RESET_ON_FORK /* sanity check */ diff --git a/schedutils/ionice.c b/schedutils/ionice.c index 34132f07..78c9f0d3 100644 --- a/schedutils/ionice.c +++ b/schedutils/ionice.c @@ -18,7 +18,7 @@ #include "nls.h" -#include "schedutils.h" +#include "strutils.h" static int tolerant; @@ -105,15 +105,15 @@ int main(int argc, char *argv[]) while ((c = getopt(argc, argv, "+n:c:p:th")) != EOF) { switch (c) { case 'n': - ioprio = getnum(optarg, _("failed to parse class data")); + ioprio = strtol_or_err(optarg, _("failed to parse class data")); set |= 1; break; case 'c': - ioclass = getnum(optarg, _("failed to parse class")); + ioclass = strtol_or_err(optarg, _("failed to parse class")); set |= 2; break; case 'p': - pid = getnum(optarg, _("failed to parse pid")); + pid = strtol_or_err(optarg, _("failed to parse pid")); break; case 't': tolerant = 1; @@ -147,7 +147,7 @@ int main(int argc, char *argv[]) ioprio_print(pid); for(; argv[optind]; ++optind) { - pid = getnum(argv[optind], _("failed to parse pid")); + pid = strtol_or_err(argv[optind], _("failed to parse pid")); ioprio_print(pid); } } else { @@ -156,7 +156,7 @@ int main(int argc, char *argv[]) for(; argv[optind]; ++optind) { - pid = getnum(argv[optind], _("failed to parse pid")); + pid = strtol_or_err(argv[optind], _("failed to parse pid")); ioprio_setpid(pid, ioprio, ioclass); } } diff --git a/schedutils/schedutils.c b/schedutils/schedutils.c deleted file mode 100644 index 9d6051ba..00000000 --- a/schedutils/schedutils.c +++ /dev/null @@ -1,34 +0,0 @@ -/* - * Copyright (C) 2010 Karel Zak - * - * Released under the terms of the GNU General Public License version 2 - * - */ -#include -#include -#include -#include - -#include "nls.h" - -long getnum(const char *str, const char *errmesg) -{ - long num; - char *end = NULL; - - if (str == NULL || *str == '\0') - goto err; - errno = 0; - num = strtol(str, &end, 10); - - if (errno || (end && *end)) - goto err; - - return num; -err: - if (errno) - err(EXIT_FAILURE, "%s: '%s'", errmesg, str); - else - errx(EXIT_FAILURE, "%s: '%s'", errmesg, str); - return 0; -} diff --git a/schedutils/schedutils.h b/schedutils/schedutils.h deleted file mode 100644 index 80e4f7bf..00000000 --- a/schedutils/schedutils.h +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef UTIL_LINUX_SCHED_UTILS -#define UTIL_LINUX_SCHED_UTILS - -extern long getnum(const char *str, const char *errmesg); - -#endif - diff --git a/schedutils/taskset.c b/schedutils/taskset.c index 201fc158..5a7557c3 100644 --- a/schedutils/taskset.c +++ b/schedutils/taskset.c @@ -32,7 +32,7 @@ #include "cpuset.h" #include "nls.h" -#include "schedutils.h" +#include "strutils.h" static void __attribute__((__noreturn__)) usage(FILE *out) { @@ -89,7 +89,7 @@ int main(int argc, char *argv[]) while ((opt = getopt_long(argc, argv, "+pchV", longopts, NULL)) != -1) { switch (opt) { case 'p': - pid = getnum(argv[argc - 1], _("failed to parse pid")); + pid = strtol_or_err(argv[argc - 1], _("failed to parse pid")); break; case 'c': c_opt = 1; diff --git a/shlibs/mount/src/mountP.h b/shlibs/mount/src/mountP.h index 6145b730..4a99bb4e 100644 --- a/shlibs/mount/src/mountP.h +++ b/shlibs/mount/src/mountP.h @@ -60,15 +60,6 @@ extern int mnt_run_test(struct mtest *tests, int argc, char *argv[]); /* utils.c */ extern char *mnt_getenv_safe(const char *arg); -#ifndef HAVE_STRNLEN -extern size_t strnlen(const char *s, size_t maxlen); -#endif -#ifndef HAVE_STRNDUP -extern char *strndup(const char *s, size_t n); -#endif -#ifndef HAVE_STRNCHR -extern char *strnchr(const char *s, size_t maxlen, int c); -#endif extern char *mnt_get_username(const uid_t uid); /* diff --git a/shlibs/mount/src/utils.c b/shlibs/mount/src/utils.c index 6133cdd7..a1ab50c0 100644 --- a/shlibs/mount/src/utils.c +++ b/shlibs/mount/src/utils.c @@ -51,45 +51,6 @@ char *mnt_getenv_safe(const char *arg) #endif } -/* TODO: move strn<...> functions to top-level lib/strn.c */ -#ifndef HAVE_STRNLEN -size_t strnlen(const char *s, size_t maxlen) -{ - int i; - - for (i = 0; i < maxlen; i++) { - if (s[i] == '\0') - return i + 1; - } - return maxlen; -} -#endif - -#ifndef HAVE_STRNCHR -char *strnchr(const char *s, size_t maxlen, int c) -{ - for (; maxlen-- && *s != '\0'; ++s) - if (*s == (char)c) - return (char *)s; - return NULL; -} -#endif - -#ifndef HAVE_STRNDUP -char *strndup(const char *s, size_t n) -{ - size_t len = strnlen (s, n); - char *new = (char *) malloc (len + 1); - - if (new == NULL) - return NULL; - - new[len] = '\0'; - return (char *) memcpy (new, s, len); -} -#endif - - /** * mnt_fstype_is_pseudofs: * @type: filesystem name diff --git a/sys-utils/Makefile.am b/sys-utils/Makefile.am index d2b85685..a45978e3 100644 --- a/sys-utils/Makefile.am +++ b/sys-utils/Makefile.am @@ -31,7 +31,7 @@ tunelp_SOURCES = tunelp.c lp.h if BUILD_FALLOCATE usrbin_exec_PROGRAMS += fallocate -fallocate_SOURCES = fallocate.c $(top_srcdir)/lib/strtosize.c +fallocate_SOURCES = fallocate.c $(top_srcdir)/lib/strutils.c dist_man_MANS += fallocate.1 endif diff --git a/sys-utils/fallocate.c b/sys-utils/fallocate.c index fd4d2a9a..9598cf10 100644 --- a/sys-utils/fallocate.c +++ b/sys-utils/fallocate.c @@ -44,7 +44,7 @@ #endif #include "nls.h" -#include "strtosize.h" +#include "strutils.h" static void __attribute__((__noreturn__)) usage(FILE *out) diff --git a/text-utils/more.c b/text-utils/more.c index 37520598..49df52e2 100644 --- a/text-utils/more.c +++ b/text-utils/more.c @@ -56,7 +56,7 @@ #include #include #include -#include "xstrncpy.h" +#include "strutils.h" #include "nls.h" #include "xalloc.h" -- cgit v1.2.3 From 8c9e72ce2b3dc8cbc9df446b8915ea936cb702b3 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 18 Nov 2010 21:03:02 +0100 Subject: lib: [ismounted] don't wast time with mtab is /proc/mounts used Signed-off-by: Karel Zak --- lib/ismounted.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'lib') diff --git a/lib/ismounted.c b/lib/ismounted.c index 592df308..f19d67b1 100644 --- a/lib/ismounted.c +++ b/lib/ismounted.c @@ -171,6 +171,10 @@ static int check_mntent(const char *file, int *mount_flags, mtpt, mtlen); if (retval == 0 && (*mount_flags != 0)) return 0; + if (access("/proc/mounts", R_OK) == 0) { + *mount_flags = 0; + return retval; + } #endif /* __linux__ */ #if defined(MOUNTED) || defined(_PATH_MOUNTED) #ifndef MOUNTED -- cgit v1.2.3 From 3e451589d5eaecfa8ddff46877f94ad79bc010f0 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Thu, 18 Nov 2010 21:04:13 +0100 Subject: lib: [tt] add TT_FL_RIGHT, add columns list parser Signed-off-by: Karel Zak --- include/tt.h | 8 +++++-- lib/tt.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 65 insertions(+), 11 deletions(-) (limited to 'lib') diff --git a/include/tt.h b/include/tt.h index bf24d550..e6a63ed3 100644 --- a/include/tt.h +++ b/include/tt.h @@ -12,11 +12,12 @@ #include "list.h" enum { - TT_FL_TRUNCATE = (1 << 1), + TT_FL_TRUNC = (1 << 1), TT_FL_TREE = (1 << 2), TT_FL_RAW = (1 << 3), TT_FL_ASCII = (1 << 4), - TT_FL_NOHEADINGS = (1 << 5) + TT_FL_NOHEADINGS = (1 << 5), + TT_FL_RIGHT = (1 << 6), }; struct tt { @@ -68,4 +69,7 @@ extern struct tt_line *tt_add_line(struct tt *tb, struct tt_line *parent); extern int tt_line_set_data(struct tt_line *ln, int colnum, const char *data); +extern int tt_parse_columns_list(const char *list, int cols[], int *ncols, + int (name2id)(const char *, size_t)); + #endif /* UTIL_LINUX_TT_H */ diff --git a/lib/tt.c b/lib/tt.c index a4aabfe0..f371a93a 100644 --- a/lib/tt.c +++ b/lib/tt.c @@ -394,12 +394,16 @@ static void recount_widths(struct tt *tb, char *buf, size_t bufsz) struct tt_column *cl = list_entry(p, struct tt_column, cl_columns); - cl->width_min = mbs_width(cl->name); + if (cl->name) + cl->width_min = mbs_width(cl->name); if (cl->width < cl->width_min) cl->width = cl->width_min; + else if (cl->width_hint >= 1 && + cl->width < (int) cl->width_hint && cl->width_min < (int) cl->width_hint) + cl->width = (int) cl->width_hint; width += cl->width + (is_last_column(tb, cl) ? 0 : 1); @@ -412,7 +416,8 @@ static void recount_widths(struct tt *tb, char *buf, size_t bufsz) struct tt_column *cl = list_entry( tb->tb_columns.prev, struct tt_column, cl_columns); - cl->width += tb->termwidth - width; + if (!(cl->flags & TT_FL_RIGHT)) + cl->width += tb->termwidth - width; goto leave; } @@ -434,7 +439,7 @@ static void recount_widths(struct tt *tb, char *buf, size_t bufsz) continue; /* never truncate columns with absolute sizes */ if (cl->flags & TT_FL_TREE) continue; /* never truncate the tree */ - if (trunc_only && !(cl->flags & TT_FL_TRUNCATE)) + if (trunc_only && !(cl->flags & TT_FL_TRUNC)) continue; if (cl->width == cl->width_min) continue; @@ -458,7 +463,7 @@ leave: struct tt_column *cl = list_entry(p, struct tt_column, cl_columns); - fprintf(stderr, "width: %s=%d [%d]\n", + fprintf(stderr, "width: %s=%d [hint=%d]\n", cl->name, cl->width, cl->width_hint > 1 ? (int) cl->width_hint : (int) (cl->width_hint * tb->termwidth)); @@ -498,20 +503,28 @@ static void print_data(struct tt *tb, struct tt_column *cl, char *data) width = len; /* truncate data */ - if (len > width && (cl->flags & TT_FL_TRUNCATE)) { + if (len > width && (cl->flags & TT_FL_TRUNC)) { len = mbs_truncate(data, width); if (!data || len == (size_t) -1) { len = 0; data = NULL; } } - if (data) - fputs(data, stdout); + if (data) { + if (!(tb->flags & TT_FL_RAW) && (cl->flags & TT_FL_RIGHT)) { + int xw = cl->width; + fprintf(stdout, "%*s", xw, data); + if (len < xw) + len = xw; + } + else + fputs(data, stdout); + } for (i = len; i < width; i++) fputc(' ', stdout); /* padding */ if (!is_last_column(tb, cl)) { - if (len > width && !(cl->flags & TT_FL_TRUNCATE)) { + if (len > width && !(cl->flags & TT_FL_TRUNC)) { fputc('\n', stdout); for (i = 0; i <= cl->seqnum; i++) { struct tt_column *x = tt_get_column(tb, i); @@ -633,6 +646,43 @@ int tt_print_table(struct tt *tb) return 0; } +int tt_parse_columns_list(const char *list, int cols[], int *ncols, + int (name2id)(const char *, size_t)) +{ + const char *begin = NULL, *p; + + if (!list || !*list || !cols || !ncols || !name2id) + return -1; + + *ncols = 0; + + for (p = list; p && *p; p++) { + const char *end = NULL; + int id; + + if (!begin) + begin = p; /* begin of the column name */ + if (*p == ',') + end = p; /* terminate the name */ + if (*(p + 1) == '\0') + end = p + 1; /* end of string */ + if (!begin || !end) + continue; + if (end <= begin) + return -1; + + id = name2id(begin, end - begin); + if (id == -1) + return -1; + cols[ *ncols ] = id; + (*ncols)++; + begin = NULL; + if (end && !*end) + break; + } + return 0; +} + #ifdef TEST_PROGRAM #include #include @@ -666,7 +716,7 @@ int main(int argc, char *argv[]) err(EXIT_FAILURE, "table initialization failed"); tt_define_column(tb, "NAME", 0.3, notree ? 0 : TT_FL_TREE); - tt_define_column(tb, "FOO", 0.3, TT_FL_TRUNCATE); + tt_define_column(tb, "FOO", 0.3, TT_FL_TRUNC); tt_define_column(tb, "BAR", 0.3, 0); tt_define_column(tb, "PATH", 0.3, 0); -- cgit v1.2.3 From ce877f2d161b80119fd6bf6ccd2c7013252156d7 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Wed, 24 Nov 2010 16:41:20 +0100 Subject: lib: [strutils] move strmode() from namei.c to strutils.c Signed-off-by: Karel Zak --- include/strutils.h | 4 ++++ lib/strutils.c | 40 ++++++++++++++++++++++++++++++++++++++++ misc-utils/Makefile.am | 2 ++ misc-utils/namei.c | 37 +------------------------------------ 4 files changed, 47 insertions(+), 36 deletions(-) (limited to 'lib') diff --git a/include/strutils.h b/include/strutils.h index e24496d3..31cf8060 100644 --- a/include/strutils.h +++ b/include/strutils.h @@ -3,6 +3,7 @@ #include #include +#include extern int strtosize(const char *str, uintmax_t *res); extern long strtol_or_err(const char *str, const char *errmesg); @@ -23,4 +24,7 @@ static inline void xstrncpy(char *dest, const char *src, size_t n) strncpy(dest, src, n-1); dest[n-1] = 0; } + +extern void strmode(mode_t mode, char *str); + #endif diff --git a/lib/strutils.c b/lib/strutils.c index f394800d..dcae9f2d 100644 --- a/lib/strutils.c +++ b/lib/strutils.c @@ -8,6 +8,7 @@ #include #include #include +#include static int do_scale_by_power (uintmax_t *x, int base, int power) { @@ -184,3 +185,42 @@ err: errx(EXIT_FAILURE, "%s: '%s'", errmesg, str); return 0; } + +/* + * Converts stat->st_mode to ls(1)-like mode string. The size of "str" must + * be 10 bytes. + */ +void strmode(mode_t mode, char *str) +{ + if (S_ISDIR(mode)) + str[0] = 'd'; + else if (S_ISLNK(mode)) + str[0] = 'l'; + else if (S_ISCHR(mode)) + str[0] = 'c'; + else if (S_ISBLK(mode)) + str[0] = 'b'; + else if (S_ISSOCK(mode)) + str[0] = 's'; + else if (S_ISFIFO(mode)) + str[0] = 'p'; + else if (S_ISREG(mode)) + str[0] = '-'; + + str[1] = mode & S_IRUSR ? 'r' : '-'; + str[2] = mode & S_IWUSR ? 'w' : '-'; + str[3] = (mode & S_ISUID + ? (mode & S_IXUSR ? 's' : 'S') + : (mode & S_IXUSR ? 'x' : '-')); + str[4] = mode & S_IRGRP ? 'r' : '-'; + str[5] = mode & S_IWGRP ? 'w' : '-'; + str[6] = (mode & S_ISGID + ? (mode & S_IXGRP ? 's' : 'S') + : (mode & S_IXGRP ? 'x' : '-')); + str[7] = mode & S_IROTH ? 'r' : '-'; + str[8] = mode & S_IWOTH ? 'w' : '-'; + str[9] = (mode & S_ISVTX + ? (mode & S_IXOTH ? 't' : 'T') + : (mode & S_IXOTH ? 'x' : '-')); + str[10] = '\0'; +} diff --git a/misc-utils/Makefile.am b/misc-utils/Makefile.am index 76b69fa4..c88b7c85 100644 --- a/misc-utils/Makefile.am +++ b/misc-utils/Makefile.am @@ -20,6 +20,8 @@ CLEANFILES = chkdupexe dist_man_MANS = cal.1 chkdupexe.1 ddate.1 logger.1 look.1 mcookie.1 \ namei.1 script.1 whereis.1 scriptreplay.1 +namei_SOURCES = namei.c $(top_srcdir)/lib/strutils.c + if BUILD_LIBUUID usrbin_exec_PROGRAMS += uuidgen dist_man_MANS += uuidgen.1 diff --git a/misc-utils/namei.c b/misc-utils/namei.c index 0342a08c..e75a165a 100644 --- a/misc-utils/namei.c +++ b/misc-utils/namei.c @@ -38,6 +38,7 @@ #include "xalloc.h" #include "nls.h" #include "widechar.h" +#include "strutils.h" #ifndef MAXSYMLINKS #define MAXSYMLINKS 256 @@ -362,42 +363,6 @@ follow_symlinks(struct namei *nm) return 0; } -static void -strmode(mode_t mode, char *str) -{ - if (S_ISDIR(mode)) - str[0] = 'd'; - else if (S_ISLNK(mode)) - str[0] = 'l'; - else if (S_ISCHR(mode)) - str[0] = 'c'; - else if (S_ISBLK(mode)) - str[0] = 'b'; - else if (S_ISSOCK(mode)) - str[0] = 's'; - else if (S_ISFIFO(mode)) - str[0] = 'p'; - else if (S_ISREG(mode)) - str[0] = '-'; - - str[1] = mode & S_IRUSR ? 'r' : '-'; - str[2] = mode & S_IWUSR ? 'w' : '-'; - str[3] = (mode & S_ISUID - ? (mode & S_IXUSR ? 's' : 'S') - : (mode & S_IXUSR ? 'x' : '-')); - str[4] = mode & S_IRGRP ? 'r' : '-'; - str[5] = mode & S_IWGRP ? 'w' : '-'; - str[6] = (mode & S_ISGID - ? (mode & S_IXGRP ? 's' : 'S') - : (mode & S_IXGRP ? 'x' : '-')); - str[7] = mode & S_IROTH ? 'r' : '-'; - str[8] = mode & S_IWOTH ? 'w' : '-'; - str[9] = (mode & S_ISVTX - ? (mode & S_IXOTH ? 't' : 'T') - : (mode & S_IXOTH ? 'x' : '-')); - str[10] = '\0'; -} - static int print_namei(struct namei *nm, char *path) { -- cgit v1.2.3 From 601d12fb103702276e01ed891fd3a09a6045f209 Mon Sep 17 00:00:00 2001 From: Karel Zak Date: Tue, 30 Nov 2010 11:41:59 +0100 Subject: rename util-linux-ng back to util-linux Signed-off-by: Karel Zak --- AUTHORS | 7 +- README | 23 +- README.devel | 6 +- README.licensing | 2 +- autogen.sh | 12 +- config/gtk-doc.make | 2 +- configure.ac | 6 +- disk-utils/blockdev.8 | 4 +- disk-utils/elvtune.8 | 4 +- disk-utils/fdformat.8 | 4 +- disk-utils/fsck.minix.8 | 4 +- disk-utils/mkfs.8 | 4 +- disk-utils/mkfs.bfs.8 | 4 +- disk-utils/mkfs.minix.8 | 4 +- disk-utils/mkswap.8 | 4 +- disk-utils/raw.8 | 4 +- disk-utils/swaplabel.8 | 2 +- fdisk/cfdisk.8 | 4 +- fdisk/fdisk.8 | 6 +- fdisk/sfdisk.8 | 4 +- fsck/fsck.8 | 4 +- getopt/getopt.1 | 4 +- hwclock/hwclock.8 | 4 +- lib/fsprobe.c | 2 +- login-utils/agetty.8 | 4 +- login-utils/chfn.1 | 4 +- login-utils/chsh.1 | 4 +- login-utils/initctl.8 | 4 +- login-utils/last.1 | 4 +- login-utils/login.1 | 4 +- login-utils/mesg.1 | 4 +- login-utils/newgrp.1 | 4 +- login-utils/simpleinit.8 | 4 +- login-utils/vipw.8 | 4 +- login-utils/wall.1 | 4 +- man/ru/ddate.1 | 4 +- misc-utils/blkid.8 | 4 +- misc-utils/cal.1 | 4 +- misc-utils/ddate.1 | 4 +- misc-utils/findfs.8 | 6 +- misc-utils/findmnt.8 | 4 +- misc-utils/kill.1 | 4 +- misc-utils/logger.1 | 4 +- misc-utils/look.1 | 4 +- misc-utils/lsblk.8 | 4 +- misc-utils/mcookie.1 | 4 +- misc-utils/namei.1 | 4 +- misc-utils/namei.c | 2 +- misc-utils/rename.1 | 4 +- misc-utils/reset.1 | 4 +- misc-utils/script.1 | 4 +- misc-utils/scriptreplay.1 | 4 +- misc-utils/setterm.1 | 4 +- misc-utils/uuidd.8 | 4 +- misc-utils/uuidgen.1 | 4 +- misc-utils/whereis.1 | 4 +- misc-utils/wipefs.8 | 4 +- misc-utils/write.1 | 4 +- mount/README.mount | 2 +- mount/fstab.5 | 4 +- mount/losetup.8 | 4 +- mount/mount.8 | 4 +- mount/swapon.8 | 4 +- mount/umount.8 | 4 +- partx/addpart.8 | 4 +- partx/delpart.8 | 4 +- partx/partx.8 | 4 +- po/util-linux-ng.pot | 11573 ------------------------------- po/util-linux.pot | 11891 ++++++++++++++++++++++++++++++++ schedutils/chrt.1 | 4 +- schedutils/ionice.1 | 4 +- schedutils/taskset.1 | 4 +- shlibs/blkid/docs/libblkid-docs.xml | 4 +- shlibs/blkid/libblkid.3 | 6 +- shlibs/blkid/src/blkid.sym | 6 +- shlibs/mount/docs/libmount-docs.xml | 4 +- shlibs/uuid/man/uuid.3 | 6 +- shlibs/uuid/man/uuid_clear.3 | 6 +- shlibs/uuid/man/uuid_compare.3 | 6 +- shlibs/uuid/man/uuid_copy.3 | 6 +- shlibs/uuid/man/uuid_generate.3 | 6 +- shlibs/uuid/man/uuid_is_null.3 | 6 +- shlibs/uuid/man/uuid_parse.3 | 6 +- shlibs/uuid/man/uuid_time.3 | 6 +- shlibs/uuid/man/uuid_unparse.3 | 6 +- sys-utils/arch.1 | 4 +- sys-utils/ctrlaltdel.8 | 4 +- sys-utils/cytune.8 | 4 +- sys-utils/dmesg.1 | 4 +- sys-utils/fallocate.1 | 4 +- sys-utils/flock.1 | 4 +- sys-utils/fsfreeze.8 | 4 +- sys-utils/fstrim.8 | 4 +- sys-utils/ipcrm.1 | 4 +- sys-utils/ipcs.1 | 4 +- sys-utils/ldattach.8 | 4 +- sys-utils/lscpu.1 | 4 +- sys-utils/pivot_root.8 | 4 +- sys-utils/readprofile.1 | 4 +- sys-utils/renice.1 | 4 +- sys-utils/rtcwake.8 | 4 +- sys-utils/setarch.8 | 4 +- sys-utils/setarch.c | 2 +- sys-utils/setsid.1 | 4 +- sys-utils/switch_root.8 | 4 +- sys-utils/tunelp.8 | 4 +- sys-utils/unshare.1 | 4 +- tests/functions.sh | 8 +- tests/helpers/test_pathnames.c | 2 +- tests/helpers/test_sysinfo.c | 2 +- tests/run.sh | 2 +- tests/ts/bitops/swapbytes | 2 +- tests/ts/blkid/low-probe | 2 +- tests/ts/blkid/lowprobe-pt | 2 +- tests/ts/blkid/md-raid0-whole | 2 +- tests/ts/blkid/md-raid1-part | 2 +- tests/ts/blkid/md-raid1-whole | 2 +- tests/ts/cal/1m | 2 +- tests/ts/cal/3m | 2 +- tests/ts/cal/year | 2 +- tests/ts/col/multibyte | 2 +- tests/ts/cramfs/fsck-endianness | 2 +- tests/ts/cramfs/mkfs | 2 +- tests/ts/cramfs/mkfs-endianness | 2 +- tests/ts/fdisk/align-512-4K | 2 +- tests/ts/fdisk/align-512-4K-63 | 2 +- tests/ts/fdisk/align-512-4K-md | 2 +- tests/ts/fdisk/align-512-512 | 2 +- tests/ts/fdisk/align-512-512-topology | 2 +- tests/ts/fdisk/doslabel | 2 +- tests/ts/fdisk/id | 2 +- tests/ts/fdisk/oddinput | 2 +- tests/ts/fdisk/sunlabel | 2 +- tests/ts/fsck/ismounted | 2 +- tests/ts/hwclock/systohc | 2 +- tests/ts/ipcs/functions.sh | 2 +- tests/ts/ipcs/headers | 2 +- tests/ts/ipcs/limits | 2 +- tests/ts/ipcs/limits2 | 2 +- tests/ts/login/checktty | 2 +- tests/ts/login/islocal | 2 +- tests/ts/look/separator | 2 +- tests/ts/lscpu/lscpu | 2 +- tests/ts/md5/md5 | 2 +- tests/ts/minix/fsck | 2 +- tests/ts/minix/mkfs | 2 +- tests/ts/misc/strtosize | 2 +- tests/ts/mount/devname | 2 +- tests/ts/mount/fstab-devname | 2 +- tests/ts/mount/fstab-devname2label | 2 +- tests/ts/mount/fstab-devname2uuid | 2 +- tests/ts/mount/fstab-label | 2 +- tests/ts/mount/fstab-label2devname | 2 +- tests/ts/mount/fstab-label2uuid | 2 +- tests/ts/mount/fstab-symlink | 2 +- tests/ts/mount/fstab-uuid | 2 +- tests/ts/mount/fstab-uuid2devname | 2 +- tests/ts/mount/fstab-uuid2label | 2 +- tests/ts/mount/label | 2 +- tests/ts/mount/move | 2 +- tests/ts/mount/mtablock | 2 +- tests/ts/mount/noncanonical | 2 +- tests/ts/mount/paths | 2 +- tests/ts/mount/remount | 2 +- tests/ts/mount/special | 4 +- tests/ts/mount/uuid | 2 +- tests/ts/namei/logic | 2 +- tests/ts/paths/built-in | 2 +- tests/ts/schedutils/cpuset | 2 +- tests/ts/script/race | 2 +- tests/ts/swapon/devname | 2 +- tests/ts/swapon/label | 2 +- tests/ts/swapon/uuid | 2 +- text-utils/col.1 | 4 +- text-utils/colcrt.1 | 4 +- text-utils/colrm.1 | 4 +- text-utils/column.1 | 4 +- text-utils/hexdump.1 | 4 +- text-utils/line.1 | 4 +- text-utils/more.1 | 4 +- text-utils/more.c | 2 +- text-utils/od.1 | 4 +- text-utils/pg.1 | 4 +- text-utils/rev.1 | 4 +- text-utils/tailf.1 | 4 +- text-utils/ul.1 | 4 +- 186 files changed, 12220 insertions(+), 11900 deletions(-) delete mode 100644 po/util-linux-ng.pot create mode 100644 po/util-linux.pot (limited to 'lib') diff --git a/AUTHORS b/AUTHORS index 4284620a..e2ef08c4 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,6 +1,5 @@ - utils-linux-ng - (fork of util-linux, based on version 2.13-pre7) + utils-linux MAINTAINER: @@ -19,6 +18,8 @@ AUTHORS (merged projects & commands): Karel Zak findmnt: Karel Zak flock: H. Peter Anvin + fstrim: Lukas Czerner + fsfreeze: Hajime Taira getopt: Frodo Looijaard hwclock: Bryan Henderson ipcmk: Hayden James @@ -27,6 +28,8 @@ AUTHORS (merged projects & commands): libmount: Karel Zak libuuid: Theodore Ts'o lscpu: Cai Qian + lsblk: Milan Broz + Karel Zak rtcwake: David Brownell Bernhard Walle schedutils: Robert Love diff --git a/README b/README index 13d13e3a..2bce3ca3 100644 --- a/README +++ b/README @@ -1,31 +1,32 @@ - util-linux-ng - (fork of util-linux, based on version 2.13-pre7) + util-linux - util-linux is a random collection of Linux utilities + util-linux is a random collection of Linux utilities + + Note that in years 2006-2010 this project used the name "util-linux-ng". WEB PAGE: - http://kernel.org/~kzak/util-linux-ng/ + http://kernel.org/~kzak/util-linux/ MAILING LIST: E-MAIL: util-linux-ng@vger.kernel.org - URL: http://vger.kernel.org/vger-lists.html#util-linux-ng + URL: http://vger.kernel.org/vger-lists.html#util-linux DOWNLOAD: - ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/ + ftp://ftp.kernel.org/pub/linux/utils/util-linux/ SOURCE CODE: Web interface: - http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git + http://git.kernel.org/?p=utils/util-linux/util-linux.git Checkout: - git clone git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git util-linux-ng + git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git util-linux NLS (PO TRANSLATIONS): @@ -34,7 +35,7 @@ NLS (PO TRANSLATIONS): NEUTRALITY: - The stuff in util-linux-ng should be rather distribution-neutral. + The stuff in util-linux should be rather distribution-neutral. No RPMs/DEBs/... are provided - get yours from your distributor. @@ -51,9 +52,7 @@ VERSION SCHEMA: Development releases: - . - - suffix = "devel" or "-rc" + .-rc COMPILATION: diff --git a/README.devel b/README.devel index fdfa2644..752427d7 100644 --- a/README.devel +++ b/README.devel @@ -1,6 +1,6 @@ - Notes for util-linux-ng developers - ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Notes for util-linux developers + ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ AUTOTOOLS: @@ -88,7 +88,7 @@ CODING STYLE: SCM (source code management): - git clone git://git.kernel.org/pub/scm/utils/util-linux-ng/util-linux-ng.git util-linux-ng + git clone git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git util-linux * maintenance (stable) branch diff --git a/README.licensing b/README.licensing index 6beb96eb..b29883c9 100644 --- a/README.licensing +++ b/README.licensing @@ -1,5 +1,5 @@ -The project util-linux-ng doesn't use the same license for all of the code. +The project util-linux doesn't use the same license for all of the code. There is code under: * GPLv3+ (GNU General Public License version 3, or any later version) diff --git a/autogen.sh b/autogen.sh index f5e83f2a..4ef4b414 100755 --- a/autogen.sh +++ b/autogen.sh @@ -16,14 +16,14 @@ HAS_GTKDOC=1 (autopoint --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have autopoint installed to generate util-linux-ng build system.." + echo "You must have autopoint installed to generate util-linux build system.." echo "Download the appropriate package for your distribution," echo "or see http://www.gnu.org/software/gettext" DIE=1 } (autoconf --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have autoconf installed to generate util-linux-ng build system." + echo "You must have autoconf installed to generate util-linux build system." echo echo "Download the appropriate package for your distribution," echo "or see http://www.gnu.org/software/autoconf" @@ -32,7 +32,7 @@ HAS_GTKDOC=1 #(libtool --version) < /dev/null > /dev/null 2>&1 || { # echo -# echo "You must have libtool-2 installed to generate util-linux-ng build system." +# echo "You must have libtool-2 installed to generate util-linux build system." # echo "Download the appropriate package for your distribution," # echo "or see http://www.gnu.org/software/libtool" # DIE=1 @@ -40,7 +40,7 @@ HAS_GTKDOC=1 (automake --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have automake installed to generate util-linux-ng build system." + echo "You must have automake installed to generate util-linux build system." echo echo "Download the appropriate package for your distribution," echo "or see http://www.gnu.org/software/automake" @@ -48,7 +48,7 @@ HAS_GTKDOC=1 } (autoheader --version) < /dev/null > /dev/null 2>&1 || { echo - echo "You must have autoheader installed to generate util-linux-ng build system." + echo "You must have autoheader installed to generate util-linux build system." echo echo "Download the appropriate package for your distribution," echo "or see http://www.gnu.org/software/autoheader" @@ -60,7 +60,7 @@ if test "$DIE" -eq 1; then fi test -f mount/mount.c || { - echo "You must run this script in the top-level util-linux-ng directory" + echo "You must run this script in the top-level util-linux directory" exit 1 } diff --git a/config/gtk-doc.make b/config/gtk-doc.make index 19cd0e6b..dfddfc3f 100644 --- a/config/gtk-doc.make +++ b/config/gtk-doc.make @@ -1,6 +1,6 @@ # # WARNING: this is not gtk-doc.make file from gtk-doc project. This -# file has been modified to match with util-linux-ng requirements: +# file has been modified to match with util-linux requirements: # # * install files to $datadir # * don't maintain generated files in git repository diff --git a/configure.ac b/configure.ac index ca3e4af5..c2409037 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT(util-linux-ng, 2.18, kzak@redhat.com) +AC_INIT(util-linux, 2.18, kzak@redhat.com) AC_PREREQ(2.60) @@ -393,10 +393,10 @@ if test "x$have_blkid" = xyes; then AC_DEFINE(HAVE_LIBBLKID, 1, [Define to 1 if you have the -lblkid.]) else if test "x$build_mount" = xyes; then - AC_MSG_ERROR([libblkid is needed to build util-linux-ng mount]) + AC_MSG_ERROR([libblkid is needed to build util-linux mount]) fi if test "x$enable_fsck" = xyes; then - AC_MSG_ERROR([libblkid is needed to build util-linux-ng fsck]) + AC_MSG_ERROR([libblkid is needed to build util-linux fsck]) fi fi AM_CONDITIONAL(HAVE_BLKID, test "x$have_blkid" = xyes) diff --git a/disk-utils/blockdev.8 b/disk-utils/blockdev.8 index 7176ffac..6a58f297 100644 --- a/disk-utils/blockdev.8 +++ b/disk-utils/blockdev.8 @@ -80,6 +80,6 @@ Set read-write. .SH AUTHOR blockdev was written by Andries E. Brouwer and rewritten by Karel Zak. .SH AVAILABILITY -The blockdev command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The blockdev command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/elvtune.8 b/disk-utils/elvtune.8 index 91cbae89..10a2e382 100644 --- a/disk-utils/elvtune.8 +++ b/disk-utils/elvtune.8 @@ -61,5 +61,5 @@ Ioctls for tuning elevator behaviour were added in Linux 2.3.99-pre1. .SH AUTHORS Andrea Arcangeli SuSE .SH AVAILABILITY -The elvtune command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The elvtune command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/fdformat.8 b/disk-utils/fdformat.8 index cbfc00c1..7b6e262d 100644 --- a/disk-utils/fdformat.8 +++ b/disk-utils/fdformat.8 @@ -58,5 +58,5 @@ after the format. .SH AUTHOR Werner Almesberger (almesber@nessie.cs.id.ethz.ch) .SH AVAILABILITY -The fdformat command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The fdformat command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/fsck.minix.8 b/disk-utils/fsck.minix.8 index 5aeab5cb..f4bb4d0c 100644 --- a/disk-utils/fsck.minix.8 +++ b/disk-utils/fsck.minix.8 @@ -132,5 +132,5 @@ Langfeldt (janl@math.uio.no) .br Portability patch by Russell King (rmk@ecs.soton.ac.uk). .SH AVAILABILITY -The fsck.minix command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The fsck.minix command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/mkfs.8 b/disk-utils/mkfs.8 index 1a78b20f..6a396338 100644 --- a/disk-utils/mkfs.8 +++ b/disk-utils/mkfs.8 @@ -111,5 +111,5 @@ for the ext2 file system. .BR mkfs.xfs (8), .BR mkfs.xiafs (8) .SH AVAILABILITY -The mkfs command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The mkfs command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/mkfs.bfs.8 b/disk-utils/mkfs.bfs.8 index d120506a..741fca9c 100644 --- a/disk-utils/mkfs.bfs.8 +++ b/disk-utils/mkfs.bfs.8 @@ -44,5 +44,5 @@ is 0 when all went well, and 1 when something went wrong. .SH "SEE ALSO" .BR mkfs (8). .SH AVAILABILITY -The mkfs.bfs command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The mkfs.bfs command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/mkfs.minix.8 b/disk-utils/mkfs.minix.8 index 0261037f..93591060 100644 --- a/disk-utils/mkfs.minix.8 +++ b/disk-utils/mkfs.minix.8 @@ -76,5 +76,5 @@ Usage or syntax error .BR fsck (8), .BR reboot (8) .SH AVAILABILITY -The mkfs.minix command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The mkfs.minix command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/mkswap.8 b/disk-utils/mkswap.8 index 283a933d..00c089d8 100644 --- a/disk-utils/mkswap.8 +++ b/disk-utils/mkswap.8 @@ -153,5 +153,5 @@ to create the file is not acceptable). .BR fdisk (8), .BR swapon (8) .SH AVAILABILITY -The mkswap command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The mkswap command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/raw.8 b/disk-utils/raw.8 index 72bb17c9..9b4b9573 100644 --- a/disk-utils/raw.8 +++ b/disk-utils/raw.8 @@ -90,5 +90,5 @@ but is regarded either a bug or a feature depending on who you ask! .SH AUTHOR Stephen Tweedie (sct@redhat.com) .SH AVAILABILITY -The raw command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The raw command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/disk-utils/swaplabel.8 b/disk-utils/swaplabel.8 index 5c8b9e32..35724671 100644 --- a/disk-utils/swaplabel.8 +++ b/disk-utils/swaplabel.8 @@ -59,7 +59,7 @@ must be in the standard 8-4-4-4-12 character format, such as is ouput by was written by Jason Borden and Karel Zak . .SH AVAILABILITY .B swaplabel -is part of the util-linux-ng package and is available from ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +is part of the util-linux package and is available from ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH SEE ALSO .BR mkswap (8), .BR swapon (8), diff --git a/fdisk/cfdisk.8 b/fdisk/cfdisk.8 index 703ee190..c6ea1472 100644 --- a/fdisk/cfdisk.8 +++ b/fdisk/cfdisk.8 @@ -442,5 +442,5 @@ The current version does not support multiple disks. Kevin E. Martin (martin@cs.unc.edu) .SH AVAILABILITY -The cfdisk command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The cfdisk command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/fdisk/fdisk.8 b/fdisk/fdisk.8 index a2d8e434..66da0006 100644 --- a/fdisk/fdisk.8 +++ b/fdisk/fdisk.8 @@ -185,7 +185,7 @@ program and Linux partitions with the Linux fdisk or Linux cfdisk program. .BI "\-b " sectorsize Specify the sector size of the disk. Valid values are 512, 1024, 2048 or 4096. (Recent kernels know the sector size. Use this only on old kernels or -to override the kernel's ideas.) Since util-linux-ng-2.17, fdisk differentiates +to override the kernel's ideas.) Since util-linux-2.17, fdisk differentiates between logical and physical sector size. This option changes both sector sizes to .IB sectorsize . .TP @@ -279,5 +279,5 @@ The option `dump partition table to file' is missing. .BR partprobe (8), .BR kpartx (8) .SH AVAILABILITY -The fdisk command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The fdisk command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/fdisk/sfdisk.8 b/fdisk/sfdisk.8 index a1982470..7e2dca93 100644 --- a/fdisk/sfdisk.8 +++ b/fdisk/sfdisk.8 @@ -559,5 +559,5 @@ There is no support for non-DOS partition types. .BR partprobe (8), .BR kpartx (8) .SH AVAILABILITY -The sfdisk command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The sfdisk command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/fsck/fsck.8 b/fsck/fsck.8 index 3d60ac08..40fe6251 100644 --- a/fsck/fsck.8 +++ b/fsck/fsck.8 @@ -370,8 +370,8 @@ option as of this writing. .SH AUTHOR Theodore Ts'o (tytso@mit.edu) .SH AVAILABILITY -The fsck command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The fsck command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH FILES .IR /etc/fstab . .SH ENVIRONMENT VARIABLES diff --git a/getopt/getopt.1 b/getopt/getopt.1 index 755dc976..2e6fbdad 100644 --- a/getopt/getopt.1 +++ b/getopt/getopt.1 @@ -460,5 +460,5 @@ Frodo Looijaard .BR bash (1), .BR tcsh (1). .SH AVAILABILITY -The getopt command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The getopt command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/hwclock/hwclock.8 b/hwclock/hwclock.8 index bdcbaa85..31f76929 100644 --- a/hwclock/hwclock.8 +++ b/hwclock/hwclock.8 @@ -631,5 +631,5 @@ program by Charles Hedrick, Rob Hooft, and Harald Koenig. See the source code for complete history and credits. .SH AVAILABILITY -The hwclock command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The hwclock command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/lib/fsprobe.c b/lib/fsprobe.c index e92e03fc..e298639a 100644 --- a/lib/fsprobe.c +++ b/lib/fsprobe.c @@ -76,7 +76,7 @@ fsprobe_known_fstype(const char *fstype) #ifdef HAVE_LIBBLKID_INTERNAL /* - * libblkid from util-linux-ng + * libblkid from util-linux * -- recommended */ static blkid_probe blprobe; diff --git a/login-utils/agetty.8 b/login-utils/agetty.8 index 084086fd..a7f3bd05 100644 --- a/login-utils/agetty.8 +++ b/login-utils/agetty.8 @@ -303,5 +303,5 @@ Eric Rasmussen Added \-f option to display custom login messages on different terminals. .SH AVAILABILITY -The agetty command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The agetty command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/chfn.1 b/login-utils/chfn.1 index b63ce683..b27bec41 100644 --- a/login-utils/chfn.1 +++ b/login-utils/chfn.1 @@ -78,5 +78,5 @@ Print version information and exit. .SH AUTHOR Salvatore Valente .SH AVAILABILITY -The chfn command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The chfn command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/chsh.1 b/login-utils/chsh.1 index bc9bc432..90514b8f 100644 --- a/login-utils/chsh.1 +++ b/login-utils/chsh.1 @@ -61,5 +61,5 @@ Print version information and exit. .SH AUTHOR Salvatore Valente .SH AVAILABILITY -The chsh command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The chsh command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/initctl.8 b/login-utils/initctl.8 index 3dd26e30..7e92dea6 100644 --- a/login-utils/initctl.8 +++ b/login-utils/initctl.8 @@ -106,5 +106,5 @@ http://www.atnf.csiro.au/~rgooch/linux/boot-scripts/ Richard Gooch (rgooch@atnf.csiro.au) .SH AVAILABILITY -The initctl command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The initctl command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/last.1 b/login-utils/last.1 index 314e5d9d..3e9faa40 100644 --- a/login-utils/last.1 +++ b/login-utils/last.1 @@ -58,5 +58,5 @@ Also report year of dates. .SH FILES /var/log/wtmp \(em login data base .SH AVAILABILITY -The last command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The last command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/login.1 b/login-utils/login.1 index 12273815..2b4bea31 100644 --- a/login-utils/login.1 +++ b/login-utils/login.1 @@ -340,5 +340,5 @@ for HP-UX .br Ported to Linux 0.12: Peter Orbaek (poe@daimi.aau.dk) .SH AVAILABILITY -The login command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The login command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/mesg.1 b/login-utils/mesg.1 index 38b57382..05c42e35 100644 --- a/login-utils/mesg.1 +++ b/login-utils/mesg.1 @@ -99,5 +99,5 @@ A command appeared in Version 6 AT&T UNIX. .SH AVAILABILITY -The mesg command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The mesg command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/newgrp.1 b/login-utils/newgrp.1 index fade125c..6226c15a 100644 --- a/login-utils/newgrp.1 +++ b/login-utils/newgrp.1 @@ -30,5 +30,5 @@ Originally by Michael Haardt. Currently maintained by Peter Orbaek (poe@daimi.aau.dk). .SH AVAILABILITY -The newgrp command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The newgrp command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/simpleinit.8 b/login-utils/simpleinit.8 index cbaf093b..c253e8b5 100644 --- a/login-utils/simpleinit.8 +++ b/login-utils/simpleinit.8 @@ -176,5 +176,5 @@ Richard Gooch Dependency support .SH AVAILABILITY -The simpleinit command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The simpleinit command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/vipw.8 b/login-utils/vipw.8 index e9886832..6ed482d5 100644 --- a/login-utils/vipw.8 +++ b/login-utils/vipw.8 @@ -82,5 +82,5 @@ The .Nm vigr command appeared in Util-Linux 2.6. .Sh AVAILABILITY -The vigr and vipw commands are part of the util-linux-ng package and are available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The vigr and vipw commands are part of the util-linux package and are available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/login-utils/wall.1 b/login-utils/wall.1 index a767c7d4..1f85c409 100644 --- a/login-utils/wall.1 +++ b/login-utils/wall.1 @@ -67,5 +67,5 @@ A command appeared in .At v7 . .Sh AVAILABILITY -The wall command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The wall command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/man/ru/ddate.1 b/man/ru/ddate.1 index 59080236..cb10c57e 100644 --- a/man/ru/ddate.1 +++ b/man/ru/ddate.1 @@ -116,8 +116,8 @@ http://www.subgenius.com/ нашел" .SH ДОСТУПНОСТЬ -Команда ddate является частью пакета util-linux-ng и доступна по -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +Команда ddate является частью пакета util-linux и доступна по +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH ПЕРЕВОД Перевод Rino_ap_Codkelden 2010 \ No newline at end of file diff --git a/misc-utils/blkid.8 b/misc-utils/blkid.8 index 8968bb29..ac72bf69 100644 --- a/misc-utils/blkid.8 +++ b/misc-utils/blkid.8 @@ -253,8 +253,8 @@ For usage or other errors, an exit code of 4 is returned. was written by Andreas Dilger for libblkid and improved by Theodore Ts'o and Karel Zak. .SH AVAILABILITY -The blkid command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The blkid command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH "SEE ALSO" .BR libblkid (3) .BR findfs (8) diff --git a/misc-utils/cal.1 b/misc-utils/cal.1 index 6edb7052..38084feb 100644 --- a/misc-utils/cal.1 +++ b/misc-utils/cal.1 @@ -93,5 +93,5 @@ A .Nm command appeared in Version 6 AT&T UNIX. .Sh AVAILABILITY -The cal command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The cal command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/ddate.1 b/misc-utils/ddate.1 index 67b2057e..b14e6b34 100644 --- a/misc-utils/ddate.1 +++ b/misc-utils/ddate.1 @@ -110,5 +110,5 @@ Malaclypse the Younger, .I "Principia Discordia, Or How I Found Goddess And What I Did To Her When I Found Her" .SH AVAILABILITY -The ddate command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The ddate command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/findfs.8 b/misc-utils/findfs.8 index 14fcf6fa..107b85b7 100644 --- a/misc-utils/findfs.8 +++ b/misc-utils/findfs.8 @@ -24,10 +24,10 @@ be printed on stdout. .SH AUTHOR .B findfs was originally written by Theodore Ts'o (tytso@mit.edu) and re-written for -util-linux-ng package by Karel Zak (kzak@redhat.com). +util-linux package by Karel Zak (kzak@redhat.com). .SH AVAILABILITY -The findfs command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The findfs command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH SEE ALSO .BR blkid (8) .BR fsck (8) diff --git a/misc-utils/findmnt.8 b/misc-utils/findmnt.8 index e1cb8ff2..c7a15357 100644 --- a/misc-utils/findmnt.8 +++ b/misc-utils/findmnt.8 @@ -146,5 +146,5 @@ Karel Zak .BR mount (8), .BR fstab (5) .SH AVAILABILITY -The findmnt command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The findmnt command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/kill.1 b/misc-utils/kill.1 index 657852ab..4591f440 100644 --- a/misc-utils/kill.1 +++ b/misc-utils/kill.1 @@ -94,5 +94,5 @@ of the named processes, and not send any signals. Taken from BSD 4.4. The ability to translate process names to process ids was added by Salvatore Valente . .SH AVAILABILITY -The kill command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The kill command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/logger.1 b/misc-utils/logger.1 index 1119f62d..df02f1e7 100644 --- a/misc-utils/logger.1 +++ b/misc-utils/logger.1 @@ -125,5 +125,5 @@ command is expected to be .St -p1003.2 compatible. .Sh AVAILABILITY -The logger command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The logger command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/look.1 b/misc-utils/look.1 index a9a7c4b3..e4dbb940 100644 --- a/misc-utils/look.1 +++ b/misc-utils/look.1 @@ -112,5 +112,5 @@ implementation. .Nm Look appeared in Version 7 AT&T Unix. .Sh AVAILABILITY -The look command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The look command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/lsblk.8 b/misc-utils/lsblk.8 index cc326063..50362c62 100644 --- a/misc-utils/lsblk.8 +++ b/misc-utils/lsblk.8 @@ -62,5 +62,5 @@ Karel Zak .BR blkid (8), .BR ls (1) .SH AVAILABILITY -The lsblk command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The lsblk command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/mcookie.1 b/misc-utils/mcookie.1 index 0396d9a1..641a7c55 100644 --- a/misc-utils/mcookie.1 +++ b/misc-utils/mcookie.1 @@ -50,5 +50,5 @@ It is assumed that none of the devices opened will block. .BR xauth (1), .BR md5sum (1) .SH AVAILABILITY -The mcookie command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The mcookie command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/namei.1 b/misc-utils/namei.1 index fc10781b..82f5d784 100644 --- a/misc-utils/namei.1 +++ b/misc-utils/namei.1 @@ -66,5 +66,5 @@ To be discovered. .BR ls (1), .BR stat (1) .SH AVAILABILITY -The namei command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The namei command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/namei.c b/misc-utils/namei.c index e75a165a..1c20b377 100644 --- a/misc-utils/namei.c +++ b/misc-utils/namei.c @@ -1,7 +1,7 @@ /* * Copyright (C) 2008 Karel Zak * - * This file is part of util-linux-ng. + * This file is part of util-linux. * * 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 diff --git a/misc-utils/rename.1 b/misc-utils/rename.1 index 255832fe..30b0699c 100644 --- a/misc-utils/rename.1 +++ b/misc-utils/rename.1 @@ -48,5 +48,5 @@ will fix the extension of your html files. .BR mmv (1), .BR mv (1) .SH AVAILABILITY -The rename command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The rename command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/reset.1 b/misc-utils/reset.1 index 99150b64..1e2f0f30 100644 --- a/misc-utils/reset.1 +++ b/misc-utils/reset.1 @@ -41,5 +41,5 @@ argument in an attempt to get cooked mode back. .SH AUTHOR Rik Faith (faith@cs.unc.edu) .SH AVAILABILITY -The reset command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The reset command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/script.1 b/misc-utils/script.1 index 24c6b572..7a7760e3 100644 --- a/misc-utils/script.1 +++ b/misc-utils/script.1 @@ -147,5 +147,5 @@ places in the log file, including linefeeds and backspaces. This is not what the naive user expects. .Sh AVAILABILITY -The script command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The script command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/scriptreplay.1 b/misc-utils/scriptreplay.1 index 3aa7b6be..d102f060 100644 --- a/misc-utils/scriptreplay.1 +++ b/misc-utils/scriptreplay.1 @@ -214,5 +214,5 @@ The program was re-written in C by James Youngman and Karel Zak . .SH AVAILABILITY -uuidd is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +uuidd is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH "SEE ALSO" .BR libuuid (3), .BR uuidgen (1) diff --git a/misc-utils/uuidgen.1 b/misc-utils/uuidgen.1 index 32c98f1d..453a7f58 100644 --- a/misc-utils/uuidgen.1 +++ b/misc-utils/uuidgen.1 @@ -52,7 +52,7 @@ OSF DCE 1.1 .B uuidgen was written by Andreas Dilger for libuuid. .SH AVAILABILITY -The uuidgen command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The uuidgen command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH "SEE ALSO" .BR libuuid (3) diff --git a/misc-utils/whereis.1 b/misc-utils/whereis.1 index b13491b6..57bfb0bc 100644 --- a/misc-utils/whereis.1 +++ b/misc-utils/whereis.1 @@ -146,5 +146,5 @@ must be full; that is, they must begin with a has a hard-coded path, so may not always find what you're looking for. .SH AVAILABILITY -The whereis command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The whereis command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/misc-utils/wipefs.8 b/misc-utils/wipefs.8 index 973f2ef2..6867dfc2 100644 --- a/misc-utils/wipefs.8 +++ b/misc-utils/wipefs.8 @@ -41,8 +41,8 @@ characters of a string to the corresponding hex value prefixed by '\\x'. .SH AUTHOR Karel Zak . .SH AVAILABILITY -The wipefs command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The wipefs command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .SH SEE ALSO .BR blkid (8) .BR findfs (8) diff --git a/misc-utils/write.1 b/misc-utils/write.1 index 4d627071..1c15f50c 100644 --- a/misc-utils/write.1 +++ b/misc-utils/write.1 @@ -98,5 +98,5 @@ A .B write command appeared in Version 6 AT&T UNIX. .SH AVAILABILITY -The write command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The write command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/mount/README.mount b/mount/README.mount index c7f317c4..8c0ac27a 100644 --- a/mount/README.mount +++ b/mount/README.mount @@ -7,5 +7,5 @@ Stephen Tweedie . Andries Brouwer Adrian Bunk -Presently in util-linux-ng maintained by Karel Zak . +Presently in util-linux maintained by Karel Zak . diff --git a/mount/fstab.5 b/mount/fstab.5 index cd5cf558..b6bd0205 100644 --- a/mount/fstab.5 +++ b/mount/fstab.5 @@ -253,5 +253,5 @@ file format appeared in 4.0BSD. .\" But without comment convention, and options and vfs_type. .\" Instead there was a type rw/ro/rq/sw/xx, where xx is the present 'ignore'. .SH AVAILABILITY -This man page is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +This man page is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/mount/losetup.8 b/mount/losetup.8 index fe8b8b83..d329c914 100644 --- a/mount/losetup.8 +++ b/mount/losetup.8 @@ -173,8 +173,8 @@ DES encryption is painfully slow. On the other hand, XOR is terribly weak. Cryptoloop is deprecated in favor of dm-crypt. For more details see .BR cryptsetup (8). .SH AVAILABILITY -The losetup command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The losetup command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. .\" .SH AUTHORS .\" .nf .\" Original version: Theodore Ts'o diff --git a/mount/mount.8 b/mount/mount.8 index 8b09de86..19e22e51 100644 --- a/mount/mount.8 +++ b/mount/mount.8 @@ -2748,6 +2748,6 @@ A .B mount command existed in Version 5 AT&T UNIX. .SH AVAILABILITY -The mount command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The mount command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/mount/swapon.8 b/mount/swapon.8 index 1fe62987..709443cc 100644 --- a/mount/swapon.8 +++ b/mount/swapon.8 @@ -216,5 +216,5 @@ The .B swapon command appeared in 4.0BSD. .SH AVAILABILITY -The swapon command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The swapon command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/mount/umount.8 b/mount/umount.8 index fac88785..3606caae 100644 --- a/mount/umount.8 +++ b/mount/umount.8 @@ -173,5 +173,5 @@ A .B umount command appeared in Version 6 AT&T UNIX. .SH AVAILABILITY -The umount command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The umount command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/partx/addpart.8 b/partx/addpart.8 index d385ba63..231cbfaf 100644 --- a/partx/addpart.8 +++ b/partx/addpart.8 @@ -36,5 +36,5 @@ Specify the length of the partition (in 512-byte sectors). .BR partprobe (8), .BR partx (8) .SH AVAILABILITY -The addpart command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The addpart command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/partx/delpart.8 b/partx/delpart.8 index 356d99c0..7dd93894 100644 --- a/partx/delpart.8 +++ b/partx/delpart.8 @@ -30,5 +30,5 @@ Specify the partition number. .BR partprobe (8), .BR partx (8) .SH AVAILABILITY -The delpart command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The delpart command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/partx/partx.8 b/partx/partx.8 index c6d04c8f..b24bc87b 100644 --- a/partx/partx.8 +++ b/partx/partx.8 @@ -52,5 +52,5 @@ Specify the range of partitions (e.g --nr 2-4). .BR partprobe (8) .SH AVAILABILITY -The partx command is part of the util-linux-ng package and is available from -ftp://ftp.kernel.org/pub/linux/utils/util-linux-ng/. +The partx command is part of the util-linux package and is available from +ftp://ftp.kernel.org/pub/linux/utils/util-linux/. diff --git a/po/util-linux-ng.pot b/po/util-linux-ng.pot deleted file mode 100644 index ed052a5d..00000000 --- a/po/util-linux-ng.pot +++ /dev/null @@ -1,11573 +0,0 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Karel Zak -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. -# -#, fuzzy -msgid "" -msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: Karel Zak \n" -"POT-Creation-Date: 2010-06-30 14:44+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: 8bit\n" - -#: disk-utils/blockdev.c:63 -msgid "set read-only" -msgstr "" - -#: disk-utils/blockdev.c:70 -msgid "set read-write" -msgstr "" - -#: disk-utils/blockdev.c:76 -msgid "get read-only" -msgstr "" - -#: disk-utils/blockdev.c:82 -msgid "get logical block (sector) size" -msgstr "" - -#: disk-utils/blockdev.c:88 -msgid "get physical block (sector) size" -msgstr "" - -#: disk-utils/blockdev.c:94 -msgid "get minimum I/O size" -msgstr "" - -#: disk-utils/blockdev.c:100 -msgid "get optimal I/O size" -msgstr "" - -#: disk-utils/blockdev.c:106 -msgid "get alignment offset" -msgstr "" - -#: disk-utils/blockdev.c:112 -msgid "get max sectors per request" -msgstr "" - -#: disk-utils/blockdev.c:118 -msgid "get blocksize" -msgstr "" - -#: disk-utils/blockdev.c:125 -msgid "set blocksize" -msgstr "" - -#: disk-utils/blockdev.c:131 -msgid "get 32-bit sector count" -msgstr "" - -#: disk-utils/blockdev.c:137 -msgid "get size in bytes" -msgstr "" - -#: disk-utils/blockdev.c:144 -msgid "set readahead" -msgstr "" - -#: disk-utils/blockdev.c:150 -msgid "get readahead" -msgstr "" - -#: disk-utils/blockdev.c:157 -msgid "set filesystem readahead" -msgstr "" - -#: disk-utils/blockdev.c:163 -msgid "get filesystem readahead" -msgstr "" - -#: disk-utils/blockdev.c:167 -msgid "flush buffers" -msgstr "" - -#: disk-utils/blockdev.c:171 -msgid "reread partition table" -msgstr "" - -#: disk-utils/blockdev.c:179 -#, c-format -msgid "Usage:\n" -msgstr "" - -#: disk-utils/blockdev.c:180 -#, c-format -msgid " %s -V\n" -msgstr "" - -#: disk-utils/blockdev.c:181 -#, c-format -msgid " %s --report [devices]\n" -msgstr "" - -#: disk-utils/blockdev.c:182 -#, c-format -msgid " %s [-v|-q] commands devices\n" -msgstr "" - -#: disk-utils/blockdev.c:185 -#, c-format -msgid "Available commands:\n" -msgstr "" - -#: disk-utils/blockdev.c:187 -msgid "get size in 512-byte sectors" -msgstr "" - -#: disk-utils/blockdev.c:238 disk-utils/fdformat.c:118 -#: disk-utils/fsck.minix.c:1284 disk-utils/isosize.c:181 -#: disk-utils/mkfs.bfs.c:114 disk-utils/mkfs.c:52 disk-utils/mkfs.cramfs.c:812 -#: disk-utils/mkfs.minix.c:152 disk-utils/mkfs.minix.c:572 -#: disk-utils/mkswap.c:473 misc-utils/ddate.c:179 misc-utils/rename.c:79 -#: misc-utils/script.c:153 mount/swapon.c:666 mount/swapon.c:718 -#: sys-utils/readprofile.c:197 sys-utils/tunelp.c:84 -#, c-format -msgid "%s (%s)\n" -msgstr "" - -#: disk-utils/blockdev.c:321 -#, c-format -msgid "%s: Unknown command: %s\n" -msgstr "" - -#: disk-utils/blockdev.c:338 -#, c-format -msgid "%s requires an argument\n" -msgstr "" - -#: disk-utils/blockdev.c:375 -#, c-format -msgid "%s failed.\n" -msgstr "" - -#: disk-utils/blockdev.c:382 -#, c-format -msgid "%s succeeded.\n" -msgstr "" - -#: disk-utils/blockdev.c:427 disk-utils/blockdev.c:455 -#, c-format -msgid "%s: cannot open %s\n" -msgstr "" - -#: disk-utils/blockdev.c:472 -#, c-format -msgid "%s: ioctl error on %s\n" -msgstr "" - -#: disk-utils/blockdev.c:481 -#, c-format -msgid "RO RA SSZ BSZ StartSec Size Device\n" -msgstr "" - -#: disk-utils/elvtune.c:48 -#, c-format -msgid "usage:\n" -msgstr "" - -#: disk-utils/elvtune.c:53 -#, c-format -msgid "\tNOTE: elvtune only works with 2.4 kernels\n" -msgstr "" - -#: disk-utils/elvtune.c:104 -#, c-format -msgid "parse error\n" -msgstr "" - -#: disk-utils/elvtune.c:110 -#, c-format -msgid "missing blockdevice, use -h for help\n" -msgstr "" - -#: disk-utils/elvtune.c:131 -#, c-format -msgid "" -"\n" -"elvtune is only useful on older kernels;\n" -"for 2.6 use IO scheduler sysfs tunables instead..\n" -msgstr "" - -#: disk-utils/fdformat.c:31 -#, c-format -msgid "Formatting ... " -msgstr "" - -#: disk-utils/fdformat.c:49 disk-utils/fdformat.c:86 -#, c-format -msgid "done\n" -msgstr "" - -#: disk-utils/fdformat.c:60 -#, c-format -msgid "Verifying ... " -msgstr "" - -#: disk-utils/fdformat.c:71 -msgid "Read: " -msgstr "" - -#: disk-utils/fdformat.c:73 -#, c-format -msgid "Problem reading cylinder %d, expected %d, read %d\n" -msgstr "" - -#: disk-utils/fdformat.c:80 -#, c-format -msgid "" -"bad data in cyl %d\n" -"Continuing ... " -msgstr "" - -#: disk-utils/fdformat.c:96 -#, c-format -msgid "usage: %s [ -n ] device\n" -msgstr "" - -#: disk-utils/fdformat.c:132 -#, c-format -msgid "%s: not a block device\n" -msgstr "" - -#: disk-utils/fdformat.c:142 -msgid "Could not determine current format type" -msgstr "" - -#: disk-utils/fdformat.c:143 -#, c-format -msgid "%s-sided, %d tracks, %d sec/track. Total capacity %d kB.\n" -msgstr "" - -#: disk-utils/fdformat.c:144 -msgid "Double" -msgstr "" - -#: disk-utils/fdformat.c:144 -msgid "Single" -msgstr "" - -#: disk-utils/fsck.cramfs.c:117 -#, c-format -msgid "" -"usage: %s [-hv] [-x dir] file\n" -" -h print this help\n" -" -x dir extract into dir\n" -" -v be more verbose\n" -" file file to test\n" -msgstr "" - -#: disk-utils/fsck.cramfs.c:163 -#, c-format -msgid "stat failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:167 disk-utils/fsck.cramfs.c:551 -#, c-format -msgid "open failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:172 -#, c-format -msgid "ioctl failed: unable to determine device size: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:180 -#, c-format -msgid "not a block device or file: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:184 disk-utils/fsck.cramfs.c:226 -msgid "file length too short" -msgstr "" - -#: disk-utils/fsck.cramfs.c:189 disk-utils/fsck.cramfs.c:197 -#: disk-utils/fsck.cramfs.c:258 disk-utils/fsck.cramfs.c:278 -#, c-format -msgid "read failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:207 -msgid "superblock magic not found" -msgstr "" - -#: disk-utils/fsck.cramfs.c:216 -msgid "unsupported filesystem features" -msgstr "" - -#: disk-utils/fsck.cramfs.c:219 -#, c-format -msgid "superblock size (%d) too small" -msgstr "" - -#: disk-utils/fsck.cramfs.c:223 -msgid "zero file count" -msgstr "" - -#: disk-utils/fsck.cramfs.c:229 -#, c-format -msgid "warning: file extends past end of filesystem\n" -msgstr "" - -#: disk-utils/fsck.cramfs.c:233 -#, c-format -msgid "warning: old cramfs format\n" -msgstr "" - -#: disk-utils/fsck.cramfs.c:246 -msgid "unable to test CRC: old cramfs format" -msgstr "" - -#: disk-utils/fsck.cramfs.c:272 disk-utils/fsck.cramfs.c:339 -#: disk-utils/fsck.cramfs.c:477 login-utils/chfn.c:529 login-utils/chsh.c:439 -#: misc-utils/wipefs.c:143 schedutils/taskset.c:127 sys-utils/cytune.c:321 -msgid "malloc failed" -msgstr "" - -#: disk-utils/fsck.cramfs.c:297 -msgid "crc error" -msgstr "" - -#: disk-utils/fsck.cramfs.c:364 -msgid "root inode is not directory" -msgstr "" - -#: disk-utils/fsck.cramfs.c:369 -#, c-format -msgid "bad root offset (%lu)" -msgstr "" - -#: disk-utils/fsck.cramfs.c:387 -msgid "data block too large" -msgstr "" - -#: disk-utils/fsck.cramfs.c:391 -#, c-format -msgid "decompression error %p(%d): %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:415 -#, c-format -msgid " hole at %ld (%zd)\n" -msgstr "" - -#: disk-utils/fsck.cramfs.c:423 disk-utils/fsck.cramfs.c:595 -#, c-format -msgid " uncompressing block at %ld to %ld (%ld)\n" -msgstr "" - -#: disk-utils/fsck.cramfs.c:429 -#, c-format -msgid "non-block (%ld) bytes" -msgstr "" - -#: disk-utils/fsck.cramfs.c:433 -#, c-format -msgid "non-size (%ld vs %ld) bytes" -msgstr "" - -#: disk-utils/fsck.cramfs.c:439 -#, c-format -msgid "write failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:452 -#, c-format -msgid "lchown failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:458 -#, c-format -msgid "chown failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:465 -#, c-format -msgid "utime failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:480 -#, c-format -msgid "directory inode has zero offset and non-zero size: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:494 -#, c-format -msgid "mkdir failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:511 -msgid "filename length is zero" -msgstr "" - -#: disk-utils/fsck.cramfs.c:514 -msgid "bad filename length" -msgstr "" - -#: disk-utils/fsck.cramfs.c:521 -msgid "bad inode offset" -msgstr "" - -#: disk-utils/fsck.cramfs.c:537 -msgid "file inode has zero offset and non-zero size" -msgstr "" - -#: disk-utils/fsck.cramfs.c:540 -msgid "file inode has zero size and non-zero offset" -msgstr "" - -#: disk-utils/fsck.cramfs.c:571 -msgid "symbolic link has zero offset" -msgstr "" - -#: disk-utils/fsck.cramfs.c:574 -msgid "symbolic link has zero size" -msgstr "" - -#: disk-utils/fsck.cramfs.c:586 -#, c-format -msgid "size error in symlink: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:601 -#, c-format -msgid "symlink failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:613 -#, c-format -msgid "special file has non-zero offset: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:625 -#, c-format -msgid "fifo has non-zero size: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:631 -#, c-format -msgid "socket has non-zero size: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:636 -#, c-format -msgid "bogus mode: %s (%o)" -msgstr "" - -#: disk-utils/fsck.cramfs.c:646 -#, c-format -msgid "mknod failed: %s" -msgstr "" - -#: disk-utils/fsck.cramfs.c:682 -#, c-format -msgid "directory data start (%ld) < sizeof(struct cramfs_super) + start (%ld)" -msgstr "" - -#: disk-utils/fsck.cramfs.c:685 -#, c-format -msgid "directory data end (%ld) != file data start (%ld)" -msgstr "" - -#: disk-utils/fsck.cramfs.c:690 -msgid "invalid file data offset" -msgstr "" - -#: disk-utils/fsck.cramfs.c:714 -msgid "failed to allocate outbuffer" -msgstr "" - -#: disk-utils/fsck.cramfs.c:727 -msgid "compiled without -x support" -msgstr "" - -#: disk-utils/fsck.minix.c:207 -#, c-format -msgid "Usage: %s [-larvsmf] /dev/name\n" -msgstr "" - -#: disk-utils/fsck.minix.c:323 -#, c-format -msgid "%s is mounted.\t " -msgstr "" - -#: disk-utils/fsck.minix.c:325 -msgid "Do you really want to continue" -msgstr "" - -#: disk-utils/fsck.minix.c:329 -#, c-format -msgid "check aborted.\n" -msgstr "" - -#: disk-utils/fsck.minix.c:348 disk-utils/fsck.minix.c:371 -#, c-format -msgid "Zone nr < FIRSTZONE in file `%s'." -msgstr "" - -#: disk-utils/fsck.minix.c:352 disk-utils/fsck.minix.c:375 -#, c-format -msgid "Zone nr >= ZONES in file `%s'." -msgstr "" - -#: disk-utils/fsck.minix.c:357 disk-utils/fsck.minix.c:380 -msgid "Remove block" -msgstr "" - -#: disk-utils/fsck.minix.c:398 -#, c-format -msgid "Read error: unable to seek to block in file '%s'\n" -msgstr "" - -#: disk-utils/fsck.minix.c:404 -#, c-format -msgid "Read error: bad block in file '%s'\n" -msgstr "" - -#: disk-utils/fsck.minix.c:419 -#, c-format -msgid "" -"Internal error: trying to write bad block\n" -"Write request ignored\n" -msgstr "" - -#: disk-utils/fsck.minix.c:425 disk-utils/mkfs.minix.c:207 -msgid "seek failed in write_block" -msgstr "" - -#: disk-utils/fsck.minix.c:428 -#, c-format -msgid "Write error: bad block in file '%s'\n" -msgstr "" - -#: disk-utils/fsck.minix.c:544 -msgid "seek failed in write_super_block" -msgstr "" - -#: disk-utils/fsck.minix.c:546 disk-utils/mkfs.minix.c:194 -msgid "unable to write super-block" -msgstr "" - -#: disk-utils/fsck.minix.c:556 -msgid "Unable to write inode map" -msgstr "" - -#: disk-utils/fsck.minix.c:558 -msgid "Unable to write zone map" -msgstr "" - -#: disk-utils/fsck.minix.c:560 -msgid "Unable to write inodes" -msgstr "" - -#: disk-utils/fsck.minix.c:587 -msgid "seek failed" -msgstr "" - -#: disk-utils/fsck.minix.c:591 disk-utils/mkfs.minix.c:399 -msgid "unable to alloc buffer for superblock" -msgstr "" - -#: disk-utils/fsck.minix.c:594 -msgid "unable to read super block" -msgstr "" - -#: disk-utils/fsck.minix.c:612 -msgid "bad magic number in super-block" -msgstr "" - -#: disk-utils/fsck.minix.c:614 -msgid "Only 1k blocks/zones supported" -msgstr "" - -#: disk-utils/fsck.minix.c:616 -msgid "bad s_imap_blocks field in super-block" -msgstr "" - -#: disk-utils/fsck.minix.c:618 -msgid "bad s_zmap_blocks field in super-block" -msgstr "" - -#: disk-utils/fsck.minix.c:625 -msgid "Unable to allocate buffer for inode map" -msgstr "" - -#: disk-utils/fsck.minix.c:628 -msgid "Unable to allocate buffer for zone map" -msgstr "" - -#: disk-utils/fsck.minix.c:633 -msgid "Unable to allocate buffer for inodes" -msgstr "" - -#: disk-utils/fsck.minix.c:636 -msgid "Unable to allocate buffer for inode count" -msgstr "" - -#: disk-utils/fsck.minix.c:639 -msgid "Unable to allocate buffer for zone count" -msgstr "" - -#: disk-utils/fsck.minix.c:641 -msgid "Unable to read inode map" -msgstr "" - -#: disk-utils/fsck.minix.c:643 -msgid "Unable to read zone map" -msgstr "" - -#: disk-utils/fsck.minix.c:645 -msgid "Unable to read inodes" -msgstr "" - -#: disk-utils/fsck.minix.c:647 -#, c-format -msgid "Warning: Firstzone != Norm_firstzone\n" -msgstr "" - -#: disk-utils/fsck.minix.c:652 disk-utils/mkfs.minix.c:451 -#, c-format -msgid "%ld inodes\n" -msgstr "" - -#: disk-utils/fsck.minix.c:653 disk-utils/mkfs.minix.c:452 -#, c-format -msgid "%ld blocks\n" -msgstr "" - -#: disk-utils/fsck.minix.c:654 disk-utils/mkfs.minix.c:453 -#, c-format -msgid "Firstdatazone=%ld (%ld)\n" -msgstr "" - -#: disk-utils/fsck.minix.c:655 disk-utils/mkfs.minix.c:454 -#, c-format -msgid "Zonesize=%d\n" -msgstr "" - -#: disk-utils/fsck.minix.c:656 -#, c-format -msgid "Maxsize=%ld\n" -msgstr "" - -#: disk-utils/fsck.minix.c:657 -#, c-format -msgid "Filesystem state=%d\n" -msgstr "" - -#: disk-utils/fsck.minix.c:658 -#, c-format -msgid "" -"namelen=%d\n" -"\n" -msgstr "" - -#: disk-utils/fsck.minix.c:673 disk-utils/fsck.minix.c:724 -#, c-format -msgid "Inode %d marked unused, but used for file '%s'\n" -msgstr "" - -#: disk-utils/fsck.minix.c:677 disk-utils/fsck.minix.c:728 -msgid "Mark in use" -msgstr "" - -#: disk-utils/fsck.minix.c:699 disk-utils/fsck.minix.c:748 -#, c-format -msgid "The file `%s' has mode %05o\n" -msgstr "" - -#: disk-utils/fsck.minix.c:706 disk-utils/fsck.minix.c:754 -#, c-format -msgid "Warning: inode count too big.\n" -msgstr "" - -#: disk-utils/fsck.minix.c:766 disk-utils/fsck.minix.c:774 -msgid "root inode isn't a directory" -msgstr "" - -#: disk-utils/fsck.minix.c:788 disk-utils/fsck.minix.c:821 -#, c-format -msgid "Block has been used before. Now in file `%s'." -msgstr "" - -#: disk-utils/fsck.minix.c:790 disk-utils/fsck.minix.c:823 -#: disk-utils/fsck.minix.c:1146 disk-utils/fsck.minix.c:1155 -#: disk-utils/fsck.minix.c:1201 disk-utils/fsck.minix.c:1210 -msgid "Clear" -msgstr "" - -#: disk-utils/fsck.minix.c:800 disk-utils/fsck.minix.c:833 -#, c-format -msgid "Block %d in file `%s' is marked not in use." -msgstr "" - -#: disk-utils/fsck.minix.c:802 disk-utils/fsck.minix.c:835 -msgid "Correct" -msgstr "" - -#: disk-utils/fsck.minix.c:974 disk-utils/fsck.minix.c:1041 -#, c-format -msgid "The directory '%s' contains a bad inode number for file '%.*s'." -msgstr "" - -#: disk-utils/fsck.minix.c:977 disk-utils/fsck.minix.c:1044 -msgid " Remove" -msgstr "" - -#: disk-utils/fsck.minix.c:991 disk-utils/fsck.minix.c:1058 -#, c-format -msgid "%s: bad directory: '.' isn't first\n" -msgstr "" - -#: disk-utils/fsck.minix.c:999 disk-utils/fsck.minix.c:1067 -#, c-format -msgid "%s: bad directory: '..' isn't second\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1101 disk-utils/fsck.minix.c:1119 -msgid "internal error" -msgstr "" - -#: disk-utils/fsck.minix.c:1104 disk-utils/fsck.minix.c:1122 -#, c-format -msgid "%s: bad directory: size < 32" -msgstr "" - -#: disk-utils/fsck.minix.c:1135 -msgid "seek failed in bad_zone" -msgstr "" - -#: disk-utils/fsck.minix.c:1145 disk-utils/fsck.minix.c:1200 -#, c-format -msgid "Inode %d mode not cleared." -msgstr "" - -#: disk-utils/fsck.minix.c:1154 disk-utils/fsck.minix.c:1209 -#, c-format -msgid "Inode %d not used, marked used in the bitmap." -msgstr "" - -#: disk-utils/fsck.minix.c:1160 disk-utils/fsck.minix.c:1215 -#, c-format -msgid "Inode %d used, marked unused in the bitmap." -msgstr "" - -#: disk-utils/fsck.minix.c:1162 disk-utils/fsck.minix.c:1216 -msgid "Set" -msgstr "" - -#: disk-utils/fsck.minix.c:1166 disk-utils/fsck.minix.c:1220 -#, c-format -msgid "Inode %d (mode = %07o), i_nlinks=%d, counted=%d." -msgstr "" - -#: disk-utils/fsck.minix.c:1168 disk-utils/fsck.minix.c:1222 -msgid "Set i_nlinks to count" -msgstr "" - -#: disk-utils/fsck.minix.c:1180 disk-utils/fsck.minix.c:1234 -#, c-format -msgid "Zone %d: marked in use, no file uses it." -msgstr "" - -#: disk-utils/fsck.minix.c:1181 disk-utils/fsck.minix.c:1236 -msgid "Unmark" -msgstr "" - -#: disk-utils/fsck.minix.c:1186 disk-utils/fsck.minix.c:1241 -#, c-format -msgid "Zone %d: in use, counted=%d\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1189 disk-utils/fsck.minix.c:1244 -#, c-format -msgid "Zone %d: not in use, counted=%d\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1289 disk-utils/mkfs.minix.c:577 -#: disk-utils/mkfs.minix.c:579 -msgid "bad inode size" -msgstr "" - -#: disk-utils/fsck.minix.c:1291 -msgid "bad v2 inode size" -msgstr "" - -#: disk-utils/fsck.minix.c:1317 -msgid "need terminal for interactive repairs" -msgstr "" - -#: disk-utils/fsck.minix.c:1321 -#, c-format -msgid "unable to open '%s': %s" -msgstr "" - -#: disk-utils/fsck.minix.c:1336 -#, c-format -msgid "%s is clean, no check.\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1340 -#, c-format -msgid "Forcing filesystem check on %s.\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1342 -#, c-format -msgid "Filesystem on %s is dirty, needs checking.\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1375 -#, c-format -msgid "" -"\n" -"%6ld inodes used (%ld%%)\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1380 -#, c-format -msgid "%6ld zones used (%ld%%)\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1382 -#, c-format -msgid "" -"\n" -"%6d regular files\n" -"%6d directories\n" -"%6d character device files\n" -"%6d block device files\n" -"%6d links\n" -"%6d symbolic links\n" -"------\n" -"%6d files\n" -msgstr "" - -#: disk-utils/fsck.minix.c:1395 -#, c-format -msgid "" -"----------------------------\n" -"FILE SYSTEM HAS BEEN CHANGED\n" -"----------------------------\n" -msgstr "" - -#: disk-utils/isosize.c:129 -#, c-format -msgid "%s: failed to open: %s\n" -msgstr "" - -#: disk-utils/isosize.c:135 -#, c-format -msgid "%s: seek error on %s\n" -msgstr "" - -#: disk-utils/isosize.c:141 -#, c-format -msgid "%s: read error on %s\n" -msgstr "" - -#: disk-utils/isosize.c:150 -#, c-format -msgid "sector count: %d, sector size: %d\n" -msgstr "" - -#: disk-utils/isosize.c:200 -#, c-format -msgid "%s: option parse error\n" -msgstr "" - -#: disk-utils/isosize.c:208 -#, c-format -msgid "Usage: %s [-x] [-d ] iso9660-image\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:83 -#, c-format -msgid "" -"Usage: %s [-v] [-N nr-of-inodes] [-V volume-name]\n" -" [-F fsname] device [block-count]\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:130 -msgid "volume name too long" -msgstr "" - -#: disk-utils/mkfs.bfs.c:137 -msgid "fsname name too long" -msgstr "" - -#: disk-utils/mkfs.bfs.c:162 -#, c-format -msgid "cannot stat device %s" -msgstr "" - -#: disk-utils/mkfs.bfs.c:166 -#, c-format -msgid "%s is not a block special device" -msgstr "" - -#: disk-utils/mkfs.bfs.c:171 sys-utils/ldattach.c:270 -#, c-format -msgid "cannot open %s" -msgstr "" - -#: disk-utils/mkfs.bfs.c:182 -#, c-format -msgid "cannot get size of %s" -msgstr "" - -#: disk-utils/mkfs.bfs.c:187 -#, c-format -msgid "blocks argument too large, max is %llu" -msgstr "" - -#: disk-utils/mkfs.bfs.c:202 -msgid "too many inodes - max is 512" -msgstr "" - -#: disk-utils/mkfs.bfs.c:211 -#, c-format -msgid "not enough space, need at least %llu blocks" -msgstr "" - -#: disk-utils/mkfs.bfs.c:223 fdisk/fdisk.c:2651 -#, c-format -msgid "Device: %s\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:224 -#, c-format -msgid "Volume: <%-6s>\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:225 -#, c-format -msgid "FSname: <%-6s>\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:226 -#, c-format -msgid "BlockSize: %d\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:228 -#, c-format -msgid "Inodes: %d (in 1 block)\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:231 -#, c-format -msgid "Inodes: %d (in %lld blocks)\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:233 -#, c-format -msgid "Blocks: %lld\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:234 -#, c-format -msgid "Inode end: %d, Data end: %d\n" -msgstr "" - -#: disk-utils/mkfs.bfs.c:239 -msgid "error writing superblock" -msgstr "" - -#: disk-utils/mkfs.bfs.c:259 -msgid "error writing root inode" -msgstr "" - -#: disk-utils/mkfs.bfs.c:264 -msgid "error writing inode" -msgstr "" - -#: disk-utils/mkfs.bfs.c:267 -msgid "seek error" -msgstr "" - -#: disk-utils/mkfs.bfs.c:273 -msgid "error writing . entry" -msgstr "" - -#: disk-utils/mkfs.bfs.c:277 -msgid "error writing .. entry" -msgstr "" - -#: disk-utils/mkfs.bfs.c:281 -#, c-format -msgid "error closing %s" -msgstr "" - -#: disk-utils/mkfs.c:73 -#, c-format -msgid "Usage: mkfs [-V] [-t fstype] [fs-options] device [size]\n" -msgstr "" - -#: disk-utils/mkfs.c:88 disk-utils/mkfs.c:96 fdisk/cfdisk.c:358 -#: getopt/getopt.c:86 getopt/getopt.c:96 login-utils/wall.c:246 -#, c-format -msgid "%s: Out of memory!\n" -msgstr "" - -#: disk-utils/mkfs.c:103 -#, c-format -msgid "mkfs (%s)\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:126 -#, c-format -msgid "" -"usage: %s [-h] [-v] [-b blksize] [-e edition] [-N endian] [-i file] [-n " -"name] dirname outfile\n" -" -h print this help\n" -" -v be verbose\n" -" -E make all warnings errors (non-zero exit status)\n" -" -b blksize use this blocksize, must equal page size\n" -" -e edition set edition number (part of fsid)\n" -" -N endian set cramfs endianness (big|little|host), default host\n" -" -i file insert a file image into the filesystem (requires >= 2.4.0)\n" -" -n name set name of cramfs filesystem\n" -" -p pad by %d bytes for boot code\n" -" -s sort directory entries (old option, ignored)\n" -" -z make explicit holes (requires >= 2.3.39)\n" -" dirname root of the filesystem to be compressed\n" -" outfile output file\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:339 -#, c-format -msgid "" -"Very long (%zu bytes) filename `%s' found.\n" -" Please increase MAX_INPUT_NAMELEN in mkcramfs.c and recompile. Exiting.\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:471 -#, c-format -msgid "filesystem too big. Exiting.\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:636 -#, c-format -msgid "AIEEE: block \"compressed\" to > 2*blocklength (%ld)\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:655 -#, c-format -msgid "%6.2f%% (%+ld bytes)\t%s\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:853 -#, c-format -msgid "" -"warning: guestimate of required size (upper bound) is %lldMB, but maximum " -"image size is %uMB. We might die prematurely.\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:880 -msgid "ROM image map" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:894 -#, c-format -msgid "Including: %s\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:900 -#, c-format -msgid "Directory data: %zd bytes\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:908 -#, c-format -msgid "Everything: %zd kilobytes\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:913 -#, c-format -msgid "Super block: %zd bytes\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:920 -#, c-format -msgid "CRC: %x\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:925 -#, c-format -msgid "not enough space allocated for ROM image (%lld allocated, %zu used)\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:933 -msgid "ROM image" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:937 -#, c-format -msgid "ROM image write failed (%zd %zd)\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:946 -#, c-format -msgid "warning: filenames truncated to 255 bytes.\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:949 -#, c-format -msgid "warning: files were skipped due to errors.\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:952 -#, c-format -msgid "warning: file sizes truncated to %luMB (minus 1 byte).\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:957 -#, c-format -msgid "" -"warning: uids truncated to %u bits. (This may be a security concern.)\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:962 -#, c-format -msgid "" -"warning: gids truncated to %u bits. (This may be a security concern.)\n" -msgstr "" - -#: disk-utils/mkfs.cramfs.c:967 -#, c-format -msgid "" -"WARNING: device numbers truncated to %u bits. This almost certainly means\n" -"that some device files will be wrong.\n" -msgstr "" - -#: disk-utils/mkfs.minix.c:154 -#, c-format -msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n" -msgstr "" - -#: disk-utils/mkfs.minix.c:178 -#, c-format -msgid "%s is mounted; will not make a filesystem here!" -msgstr "" - -#: disk-utils/mkfs.minix.c:188 -msgid "seek to boot block failed in write_tables" -msgstr "" - -#: disk-utils/mkfs.minix.c:190 -msgid "unable to clear boot sector" -msgstr "" - -#: disk-utils/mkfs.minix.c:192 -msgid "seek failed in write_tables" -msgstr "" - -#: disk-utils/mkfs.minix.c:196 -msgid "unable to write inode map" -msgstr "" - -#: disk-utils/mkfs.minix.c:198 -msgid "unable to write zone map" -msgstr "" - -#: disk-utils/mkfs.minix.c:200 -msgid "unable to write inodes" -msgstr "" - -#: disk-utils/mkfs.minix.c:209 -msgid "write failed in write_block" -msgstr "" - -#: disk-utils/mkfs.minix.c:217 disk-utils/mkfs.minix.c:291 -#: disk-utils/mkfs.minix.c:340 -msgid "too many bad blocks" -msgstr "" - -#: disk-utils/mkfs.minix.c:225 -msgid "not enough good blocks" -msgstr "" - -#: disk-utils/mkfs.minix.c:440 -msgid "unable to allocate buffers for maps" -msgstr "" - -#: disk-utils/mkfs.minix.c:449 -msgid "unable to allocate buffer for inodes" -msgstr "" - -#: disk-utils/mkfs.minix.c:455 -#, c-format -msgid "" -"Maxsize=%ld\n" -"\n" -msgstr "" - -#: disk-utils/mkfs.minix.c:469 -msgid "seek failed during testing of blocks" -msgstr "" - -#: disk-utils/mkfs.minix.c:477 -#, c-format -msgid "Weird values in do_check: probably bugs\n" -msgstr "" - -#: disk-utils/mkfs.minix.c:508 disk-utils/mkswap.c:320 -msgid "seek failed in check_blocks" -msgstr "" - -#: disk-utils/mkfs.minix.c:517 -msgid "bad blocks before data-area: cannot make fs" -msgstr "" - -#: disk-utils/mkfs.minix.c:523 disk-utils/mkfs.minix.c:548 -#, c-format -msgid "%d bad blocks\n" -msgstr "" - -#: disk-utils/mkfs.minix.c:525 disk-utils/mkfs.minix.c:550 -#, c-format -msgid "one bad block\n" -msgstr "" - -#: disk-utils/mkfs.minix.c:535 -msgid "can't open file of bad blocks" -msgstr "" - -#: disk-utils/mkfs.minix.c:539 -#, c-format -msgid "badblock number input error on line %d\n" -msgstr "" - -#: disk-utils/mkfs.minix.c:540 -msgid "cannot read badblocks file" -msgstr "" - -#: disk-utils/mkfs.minix.c:620 -#, c-format -msgid "strtol error: number of blocks not specified" -msgstr "" - -#: disk-utils/mkfs.minix.c:639 -#, c-format -msgid "unable to stat %s" -msgstr "" - -#: disk-utils/mkfs.minix.c:645 -#, c-format -msgid "unable to open %s" -msgstr "" - -#: disk-utils/mkfs.minix.c:650 -#, c-format -msgid "cannot determine sector size for %s" -msgstr "" - -#: disk-utils/mkfs.minix.c:652 -#, c-format -msgid "block size smaller than physical sector size of %s" -msgstr "" - -#: disk-utils/mkfs.minix.c:655 -#, c-format -msgid "cannot determine size of %s" -msgstr "" - -#: disk-utils/mkfs.minix.c:663 -#, c-format -msgid "will not try to make filesystem on '%s'" -msgstr "" - -#: disk-utils/mkfs.minix.c:665 -msgid "number of blocks too small" -msgstr "" - -#: disk-utils/mkswap.c:157 -#, c-format -msgid "Bad user-specified page size %d\n" -msgstr "" - -#: disk-utils/mkswap.c:165 -#, c-format -msgid "Using user-specified page size %d, instead of the system value %d\n" -msgstr "" - -#: disk-utils/mkswap.c:171 -#, c-format -msgid "%s: calloc() failed: %s\n" -msgstr "" - -#: disk-utils/mkswap.c:197 -#, c-format -msgid "Bad swap header size, no label written.\n" -msgstr "" - -#: disk-utils/mkswap.c:207 -#, c-format -msgid "Label was truncated.\n" -msgstr "" - -#: disk-utils/mkswap.c:213 -#, c-format -msgid "no label, " -msgstr "" - -#: disk-utils/mkswap.c:221 -#, c-format -msgid "no uuid\n" -msgstr "" - -#: disk-utils/mkswap.c:286 -#, c-format -msgid "Usage: %s [-c] [-pPAGESZ] [-L label] [-U UUID] /dev/name [blocks]\n" -msgstr "" - -#: disk-utils/mkswap.c:302 -msgid "too many bad pages" -msgstr "" - -#: disk-utils/mkswap.c:315 misc-utils/look.c:182 misc-utils/setterm.c:1179 -#: text-utils/more.c:2016 text-utils/more.c:2027 -msgid "Out of memory" -msgstr "" - -#: disk-utils/mkswap.c:326 -#, c-format -msgid "one bad page\n" -msgstr "" - -#: disk-utils/mkswap.c:328 -#, c-format -msgid "%lu bad pages\n" -msgstr "" - -#: disk-utils/mkswap.c:387 disk-utils/mkswap.c:424 disk-utils/mkswap.c:652 -msgid "unable to rewind swap-device" -msgstr "" - -#: disk-utils/mkswap.c:398 -msgid "unable to alloc new libblkid probe" -msgstr "" - -#: disk-utils/mkswap.c:400 -msgid "unable to assign device to libblkid probe" -msgstr "" - -#: disk-utils/mkswap.c:428 -msgid "unable to erase bootbits sectors" -msgstr "" - -#: disk-utils/mkswap.c:432 -#, c-format -msgid "%s: %s: warning: don't erase bootbits sectors\n" -msgstr "" - -#: disk-utils/mkswap.c:435 -#, c-format -msgid " (%s partition table detected). " -msgstr "" - -#: disk-utils/mkswap.c:437 -#, c-format -msgid " on whole disk. " -msgstr "" - -#: disk-utils/mkswap.c:439 -#, c-format -msgid " (compiled without libblkid). " -msgstr "" - -#: disk-utils/mkswap.c:510 -#, c-format -msgid "%1$s: warning: ignore -U (UUIDs are unsupported by %1$s)\n" -msgstr "" - -#: disk-utils/mkswap.c:526 -#, c-format -msgid "%s: does not support swapspace version %d.\n" -msgstr "" - -#: disk-utils/mkswap.c:534 -msgid "error: UUID parsing failed" -msgstr "" - -#: disk-utils/mkswap.c:545 -#, c-format -msgid "%s: error: Nowhere to set up swap on?\n" -msgstr "" - -#: disk-utils/mkswap.c:569 -#, c-format -msgid "%s: error: size %llu KiB is larger than device size %llu KiB\n" -msgstr "" - -#: disk-utils/mkswap.c:578 -#, c-format -msgid "%s: error: swap area needs to be at least %ld KiB\n" -msgstr "" - -#: disk-utils/mkswap.c:595 -#, c-format -msgid "%s: warning: truncating swap area to %llu KiB\n" -msgstr "" - -#: disk-utils/mkswap.c:618 -#, c-format -msgid "%s: error: will not try to make swapdevice on '%s'\n" -msgstr "" - -#: disk-utils/mkswap.c:624 -#, c-format -msgid "%s: error: %s is mounted; will not make swapspace.\n" -msgstr "" - -#: disk-utils/mkswap.c:641 -msgid "Unable to set up swap-space: unreadable" -msgstr "" - -#: disk-utils/mkswap.c:644 -#, c-format -msgid "Setting up swapspace version 1, size = %llu KiB\n" -msgstr "" - -#: disk-utils/mkswap.c:655 -#, c-format -msgid "%s: %s: unable to write signature page: %s" -msgstr "" - -#: disk-utils/mkswap.c:666 -msgid "fsync failed" -msgstr "" - -#: disk-utils/mkswap.c:677 -#, c-format -msgid "%s: %s: unable to obtain selinux file label: %s\n" -msgstr "" - -#: disk-utils/mkswap.c:683 -msgid "unable to matchpathcon()" -msgstr "" - -#: disk-utils/mkswap.c:686 -msgid "unable to create new selinux context" -msgstr "" - -#: disk-utils/mkswap.c:688 -msgid "couldn't compute selinux context" -msgstr "" - -#: disk-utils/mkswap.c:694 -#, c-format -msgid "%s: unable to relabel %s to %s: %s\n" -msgstr "" - -#: disk-utils/raw.c:50 -#, c-format -msgid "" -"Usage:\n" -" %s " -msgstr "" - -#: disk-utils/raw.c:125 -#, c-format -msgid "" -"Device '%s' is control raw dev (use raw where is greater than zero)\n" -msgstr "" - -#: disk-utils/raw.c:145 -#, c-format -msgid "Cannot locate block device '%s' (%s)\n" -msgstr "" - -#: disk-utils/raw.c:151 -#, c-format -msgid "Device '%s' is not a block dev\n" -msgstr "" - -#: disk-utils/raw.c:186 -#, c-format -msgid "Cannot open master raw device '" -msgstr "" - -#: disk-utils/raw.c:205 -#, c-format -msgid "Cannot locate raw device '%s' (%s)\n" -msgstr "" - -#: disk-utils/raw.c:211 -#, c-format -msgid "Raw device '%s' is not a character dev\n" -msgstr "" - -#: disk-utils/raw.c:216 -#, c-format -msgid "Device '%s' is not a raw dev\n" -msgstr "" - -#: disk-utils/raw.c:231 -#, c-format -msgid "Error querying raw device (%s)\n" -msgstr "" - -#: disk-utils/raw.c:241 disk-utils/raw.c:261 -#, c-format -msgid "raw%d:\tbound to major %d, minor %d\n" -msgstr "" - -#: disk-utils/raw.c:257 -#, c-format -msgid "Error setting raw device (%s)\n" -msgstr "" - -#: disk-utils/swaplabel.c:54 disk-utils/swaplabel.c:67 -#, c-format -msgid "%s: unable to probe device" -msgstr "" - -#: disk-utils/swaplabel.c:69 -#, c-format -msgid "%s: ambivalent probing result, use wipefs(8)" -msgstr "" - -#: disk-utils/swaplabel.c:71 -#, c-format -msgid "%s: not a valid swap partition" -msgstr "" - -#: disk-utils/swaplabel.c:77 -#, c-format -msgid "%s: unsupported swap version '%s'" -msgstr "" - -#: disk-utils/swaplabel.c:108 -#, c-format -msgid "%s: failed to open" -msgstr "" - -#: disk-utils/swaplabel.c:117 -#, c-format -msgid "failed to parse UUID: %s" -msgstr "" - -#: disk-utils/swaplabel.c:121 -#, c-format -msgid "%s: failed to seek to swap UUID" -msgstr "" - -#: disk-utils/swaplabel.c:125 -#, c-format -msgid "%s: failed to write UUID" -msgstr "" - -#: disk-utils/swaplabel.c:136 -#, c-format -msgid "%s: failed to seek to swap label " -msgstr "" - -#: disk-utils/swaplabel.c:143 -#, c-format -msgid "label is too long. Truncating it to '%s'" -msgstr "" - -#: disk-utils/swaplabel.c:146 -#, c-format -msgid "%s: failed to write label" -msgstr "" - -#: disk-utils/swaplabel.c:161 misc-utils/wipefs.c:337 -#, c-format -msgid "" -"Usage: %s [options] \n" -"\n" -"Options:\n" -msgstr "" - -#: disk-utils/swaplabel.c:165 -#, c-format -msgid "" -" -h, --help this help\n" -" -L, --label