Imported from util-linux-2.13-pre7 tarball.

This commit is contained in:
Karel Zak 2006-12-07 00:27:22 +01:00
parent cf6d7faebb
commit a120aaa70d
49 changed files with 20619 additions and 11277 deletions

View File

@ -1,5 +1,6 @@
Maintainer: Adrian Bunk <bunk@stusta.de>
Maintainer of flock: H. Peter Anvin <hpa@zytor.com>
Maintainer of getopt: Frodo Looijaard <frodol@dds.nl>
Maintainer of schedutils: Robert Love <rlove@rlove.org>
Maintainer of simpleinit: Richard Gooch <rgooch@atnf.csiro.au>

8
NEWS
View File

@ -1,3 +1,11 @@
util-linux 2.13-pre7
* mount: default to cifs instead of smbfs for sources
starting with // Lars Mueller()
* flock: documentation updates (H. Peter Anvin)
* new translation: id
* updated translations: de, it, sl, uk
util-linux 2.13-pre6
* getopt: updated to 1.1.4

20
configure vendored
View File

@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.59 for util-linux 2.13-pre6.
# Generated by GNU Autoconf 2.59 for util-linux 2.13-pre7.
#
# Report bugs to <bunk@stusta.de>.
#
@ -269,8 +269,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='util-linux'
PACKAGE_TARNAME='util-linux'
PACKAGE_VERSION='2.13-pre6'
PACKAGE_STRING='util-linux 2.13-pre6'
PACKAGE_VERSION='2.13-pre7'
PACKAGE_STRING='util-linux 2.13-pre7'
PACKAGE_BUGREPORT='bunk@stusta.de'
ac_unique_file="mount/mount.c"
@ -781,7 +781,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
\`configure' configures util-linux 2.13-pre6 to adapt to many kinds of systems.
\`configure' configures util-linux 2.13-pre7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@ -847,7 +847,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of util-linux 2.13-pre6:";;
short | recursive ) echo "Configuration of util-linux 2.13-pre7:";;
esac
cat <<\_ACEOF
@ -1007,7 +1007,7 @@ fi
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
util-linux configure 2.13-pre6
util-linux configure 2.13-pre7
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@ -1021,7 +1021,7 @@ cat >&5 <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
It was created by util-linux $as_me 2.13-pre6, which was
It was created by util-linux $as_me 2.13-pre7, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@ -1668,7 +1668,7 @@ fi
# Define the identity of the package.
PACKAGE='util-linux'
VERSION='2.13-pre6'
VERSION='2.13-pre7'
cat >>confdefs.h <<_ACEOF
@ -10985,7 +10985,7 @@ _ASBOX
} >&5
cat >&5 <<_CSEOF
This file was extended by util-linux $as_me 2.13-pre6, which was
This file was extended by util-linux $as_me 2.13-pre7, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@ -11048,7 +11048,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
util-linux config.status 2.13-pre6
util-linux config.status 2.13-pre7
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"

View File

@ -1,4 +1,4 @@
AC_INIT(util-linux, 2.13-pre6, bunk@stusta.de)
AC_INIT(util-linux, 2.13-pre7, bunk@stusta.de)
AC_PREREQ(2.59)

View File

@ -367,6 +367,7 @@ currently supported include:
.IR adfs ,
.IR affs ,
.IR autofs ,
.IR cifs ,
.IR coda ,
.IR coherent ,
.IR cramfs ,
@ -421,8 +422,8 @@ For most types all the
program has to do is issue a simple
.IR mount (2)
system call, and no detailed knowledge of the filesystem type is required.
For a few types however (like nfs, smbfs, ncpfs) ad hoc code is
necessary. The nfs ad hoc code is built in, but smbfs and ncpfs
For a few types however (like nfs, cifs, smbfs, ncpfs) ad hoc code is
necessary. The nfs ad hoc code is built in, but cifs, smbfs, and ncpfs
have a separate mount program. In order to make it possible to
treat all types in a uniform way, mount will execute the program
.I /sbin/mount.TYPE
@ -738,6 +739,11 @@ These options are accepted but ignored.
(However, quota utilities may react to such strings in
.IR /etc/fstab .)
.SH "Mount options for cifs"
See the options section of the
.BR mount.cifs (8)
man page (cifs-mount package must be installed).
.SH "Mount options for coherent"
None.

View File

@ -1171,10 +1171,10 @@ mount_one (const char *spec, const char *node, const char *types,
"I'll assume nfs because of "
"the colon\n"));
} else if(!strncmp(spec, "//", 2)) {
types = "smbfs";
types = "cifs";
if (verbose)
printf(_("mount: no type was given - "
"I'll assume smbfs because of "
"I'll assume cifs because of "
"the // prefix\n"));
}
}

View File

@ -1 +1 @@
ca cs da de es et fi fr it ja nl pt_BR ru sl sv tr uk vi
ca cs da de es et fi fr id it ja nl pt_BR ru sl sv tr uk vi

BIN
po/ca.gmo

Binary file not shown.

1053
po/ca.po

File diff suppressed because it is too large Load Diff

BIN
po/cs.gmo

Binary file not shown.

995
po/cs.po

File diff suppressed because it is too large Load Diff

BIN
po/da.gmo

Binary file not shown.

1042
po/da.po

File diff suppressed because it is too large Load Diff

BIN
po/de.gmo

Binary file not shown.

952
po/de.po

File diff suppressed because it is too large Load Diff

BIN
po/es.gmo

Binary file not shown.

1053
po/es.po

File diff suppressed because it is too large Load Diff

BIN
po/et.gmo

Binary file not shown.

995
po/et.po

File diff suppressed because it is too large Load Diff

BIN
po/fi.gmo

Binary file not shown.

1043
po/fi.po

File diff suppressed because it is too large Load Diff

BIN
po/fr.gmo

Binary file not shown.

2087
po/fr.po

File diff suppressed because it is too large Load Diff

BIN
po/id.gmo Normal file

Binary file not shown.

9796
po/id.po Normal file

File diff suppressed because it is too large Load Diff

BIN
po/it.gmo

Binary file not shown.

View File

@ -7,10 +7,10 @@
# partition table: tavola delle partizioni? tabella delle partizioni?
msgid ""
msgstr ""
"Project-Id-Version: util-linux 2.13-pre5\n"
"Project-Id-Version: util-linux 2.13-pre6\n"
"Report-Msgid-Bugs-To: Adrian Bunk <bunk@stusta.de>\n"
"POT-Creation-Date: 2005-08-14 18:14+0200\n"
"PO-Revision-Date: 2005-10-26 22:18+0100\n"
"PO-Revision-Date: 2005-11-18 20:20+0000\n"
"Last-Translator: Marco Colombo <m.colombo@ed.ac.uk>\n"
"Language-Team: Italian <tp@lists.linux.it>\n"
"MIME-Version: 1.0\n"
@ -280,12 +280,12 @@ msgstr ""
#: disk-utils/fsck.cramfs.c:571
#, c-format
msgid "%s: invalid cramfs--crc error\n"
msgstr "%s: cramfs non valido -- errore crc\n"
msgstr "%s: cramfs non valido -- errore CRC\n"
#: disk-utils/fsck.cramfs.c:577
#, c-format
msgid "%s: warning--old cramfs image, no CRC\n"
msgstr ""
msgstr "%s: attenzione -- vecchia immagine cramfs, nessun CRC\n"
#: disk-utils/fsck.cramfs.c:599
#, c-format
@ -811,7 +811,7 @@ msgstr "Blocchi: %ld\n"
#: disk-utils/mkfs.bfs.c:239
#, c-format
msgid "Inode end: %d, Data end: %d\n"
msgstr ""
msgstr "Fine inode: %d, fine dati: %d\n"
#: disk-utils/mkfs.bfs.c:244
msgid "error writing superblock"
@ -978,7 +978,7 @@ msgstr ""
#: disk-utils/mkfs.minix.c:163
#, c-format
msgid "Usage: %s [-c | -l filename] [-nXX] [-iXX] /dev/name [blocks]\n"
msgstr " Uso: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
msgstr "Uso: %s [-c | -l nomefile] [-nXX] [-iXX] /dev/name [blocchi]\n"
#: disk-utils/mkfs.minix.c:187
#, c-format
@ -4939,15 +4939,15 @@ msgstr "totale: %llu blocchi\n"
#: fdisk/sfdisk.c:2674
msgid "usage: sfdisk --print-id device partition-number\n"
msgstr "uso: sfdisk --print-id numero partizione dispositivo\n"
msgstr "Uso: sfdisk --print-id numero partizione dispositivo\n"
#: fdisk/sfdisk.c:2676
msgid "usage: sfdisk --change-id device partition-number Id\n"
msgstr " uso: sfdisk --change-id numero partizione dispositivo Id\n"
msgstr "Uso: sfdisk --change-id numero partizione dispositivo Id\n"
#: fdisk/sfdisk.c:2678
msgid "usage: sfdisk --id device partition-number [Id]\n"
msgstr "uso: sfdisk --id numero partizione dispositivo [Id]\n"
msgstr "Uso: sfdisk --id numero partizione dispositivo [Id]\n"
#: fdisk/sfdisk.c:2685
msgid "can specify only one device (except with -l or -s)\n"
@ -6006,7 +6006,7 @@ msgstr "%s: è possibile modificare solo le voci locali; utilizzare invece yp%s.
#: login-utils/chfn.c:151 login-utils/chsh.c:136
msgid "Unknown user context"
msgstr ""
msgstr "Contesto utente sconosciuto"
#: login-utils/chfn.c:152
#, c-format
@ -6211,7 +6211,7 @@ msgstr "Impossibile leggere %s, uscita."
#: login-utils/last.c:148
msgid "usage: last [-#] [-f file] [-t tty] [-h hostname] [user ...]\n"
msgstr "uso: last [-#] [-f file] [-t tty] [-h hostname] [utente ...]\n"
msgstr "Uso: last [-#] [-f file] [-t tty] [-h hostname] [utente ...]\n"
#: login-utils/last.c:284
msgid " still logged in"
@ -6260,12 +6260,12 @@ msgstr "login: -h solamente per super-user.\n"
#: login-utils/login.c:382
#, c-format
msgid "usage: login [-fp] [username]\n"
msgstr "uso: login [-fp] [nomeutente]\n"
msgstr "Uso: login [-fp] [nomeutente]\n"
#: login-utils/login.c:475
#, c-format
msgid "login: PAM Failure, aborting: %s\n"
msgstr "logine: errore PAM, interruzione in corso: %s\n"
msgstr "login: errore PAM, interruzione in corso: %s\n"
#: login-utils/login.c:477
#, c-format
@ -6514,7 +6514,7 @@ msgstr "è n\n"
#: login-utils/mesg.c:112
#, c-format
msgid "usage: mesg [y | n]\n"
msgstr "uso: mesg [s | n]\n"
msgstr "Uso: mesg [s | n]\n"
#: login-utils/newgrp.c:69
msgid "newgrp: Who are you?"
@ -6849,7 +6849,7 @@ msgstr "Volete modificare %s adesso [y/n]?"
#: login-utils/wall.c:104
#, c-format
msgid "usage: %s [file]\n"
msgstr "uso: %s [file]\n"
msgstr "Uso: %s [file]\n"
#: login-utils/wall.c:159
#, c-format
@ -6864,7 +6864,7 @@ msgstr "Messaggio broadcast da %s@%s"
#: login-utils/wall.c:204
#, c-format
msgid "%s: will not read %s - use stdin.\n"
msgstr ""
msgstr "%s: non verrà letto %s - usare stdin.\n"
#: login-utils/wall.c:209
#, c-format
@ -6903,12 +6903,12 @@ msgstr "%s %d"
#: misc-utils/cal.c:780
#, c-format
msgid "usage: cal [-13smjyV] [[month] year]\n"
msgstr "uso: cal [-13smjyV] [[mese] anno]\n"
msgstr "Uso: cal [-13smjyV] [[mese] anno]\n"
#: misc-utils/ddate.c:203
#, c-format
msgid "usage: %s [+format] [day month year]\n"
msgstr " uso: %s [+formato] [giorno mese anno]\n"
msgstr "Uso: %s [+formato] [giorno mese anno]\n"
#: misc-utils/ddate.c:250
msgid "St. Tib's Day"
@ -6937,7 +6937,7 @@ msgstr "%s: segnale sconosciuto %s; segnali validi:\n"
#: misc-utils/kill.c:354
#, c-format
msgid "usage: %s [ -s signal | -p ] [ -a ] pid ...\n"
msgstr "uso: %s [ -s segnale | -p ] [ -a ] pid ...\n"
msgstr "Uso: %s [ -s segnale | -p ] [ -a ] pid ...\n"
#: misc-utils/kill.c:355
#, c-format
@ -6962,12 +6962,12 @@ msgstr "logger: nome priorità sconosciuto: %s.\n"
#: misc-utils/logger.c:287
#, c-format
msgid "usage: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ message ... ]\n"
msgstr "uso: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ messaggio .. ]\n"
msgstr "Uso: logger [-is] [-f file] [-p pri] [-t tag] [-u socket] [ messaggio .. ]\n"
#: misc-utils/look.c:349
#, c-format
msgid "usage: look [-dfa] [-t char] string [file]\n"
msgstr " uso: look [-dfa] [-t char] stringa [file]\n"
msgstr "Uso: look [-dfa] [-t char] stringa [file]\n"
#: misc-utils/mcookie.c:122 misc-utils/mcookie.c:149
#, c-format
@ -6992,7 +6992,7 @@ msgstr "namei: impossibile eseguire chdir su %s - %s (%d)\n"
#: misc-utils/namei.c:126
#, c-format
msgid "usage: namei [-mx] pathname [pathname ...]\n"
msgstr "uso: namei [-mx] nome percorso [nome percorso ...]\n"
msgstr "Uso: namei [-mx] nome percorso [nome percorso ...]\n"
#: misc-utils/namei.c:151
#, c-format
@ -7058,7 +7058,7 @@ msgstr ""
#: misc-utils/script.c:168
#, c-format
msgid "usage: script [-a] [-f] [-q] [-t] [file]\n"
msgstr "uso: script [-a] [-f] [-q] [-t] [file]\n"
msgstr "Uso: script [-a] [-f] [-q] [-t] [file]\n"
#: misc-utils/script.c:191
#, c-format
@ -7358,7 +7358,7 @@ msgstr "write: %s ha i messaggi disattivati su %s\n"
#: misc-utils/write.c:146
#, c-format
msgid "usage: write user [tty]\n"
msgstr "uso: write utente [tty]\n"
msgstr "Uso: write utente [tty]\n"
#: misc-utils/write.c:234
#, c-format
@ -8151,7 +8151,7 @@ msgstr "%s: file %s ignorato - sembra avere dei buchi.\n"
#: mount/swapon.c:275
#, c-format
msgid "Not superuser.\n"
msgstr ""
msgstr "Non superutente.\n"
#: mount/swapon.c:309 mount/swapon.c:501
#, c-format
@ -8438,7 +8438,7 @@ msgstr " %f int/sec; %f rec (car/sec)\n"
#: sys-utils/dmesg.c:56
#, c-format
msgid "Usage: %s [-c] [-n level] [-s bufsize]\n"
msgstr " Uso: %s [-c] [-n livello] [-s bufsize]\n"
msgstr "Uso: %s [-c] [-n livello] [-s bufsize]\n"
#: sys-utils/ipcrm.c:66
#, c-format
@ -8471,7 +8471,7 @@ msgid ""
"usage: %s [ [-q msqid] [-m shmid] [-s semid]\n"
" [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
msgstr ""
"uso: %s [ [-q msqid] [-m shmid] [-s semid]\n"
"Uso: %s [ [-q msqid] [-m shmid] [-s semid]\n"
" [-Q msgkey] [-M shmkey] [-S semkey] ... ]\n"
#: sys-utils/ipcrm.c:181
@ -9100,7 +9100,7 @@ msgstr "pid"
#: sys-utils/rdev.c:69
msgid "usage: rdev [ -rv ] [ -o OFFSET ] [ IMAGE [ VALUE [ OFFSET ] ] ]"
msgstr "uso: rdev [ -rv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
msgstr "Uso: rdev [ -rv ] [ -o OFFSET ] [ IMMAGINE [ VALORE [ OFFSET ] ] ]"
#: sys-utils/rdev.c:70
msgid " rdev /dev/fd0 (or rdev /linux, etc.) displays the current ROOT device"
@ -9213,7 +9213,7 @@ msgstr "totale"
#: sys-utils/renice.c:68
#, c-format
msgid "usage: renice priority [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] users ]\n"
msgstr "uso: renice priorità [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] utenti ]\n"
msgstr "Uso: renice priorità [ [ -p ] pids ] [ [ -g ] pgrps ] [ [ -u ] utenti ]\n"
#: sys-utils/renice.c:97
#, c-format
@ -9241,7 +9241,7 @@ msgstr "%d: vecchia priorità %d, nuova priorità %d\n"
#: sys-utils/setsid.c:26
#, c-format
msgid "usage: %s program [arg ...]\n"
msgstr "uso: %s programma [arg ...]\n"
msgstr "Uso: %s programma [arg ...]\n"
#: sys-utils/tunelp.c:75
#, c-format
@ -9320,7 +9320,7 @@ msgstr "col: argomento -l non valido per %s.\n"
#: text-utils/col.c:535
#, c-format
msgid "usage: col [-bfpx] [-l nline]\n"
msgstr "uso: col [-bfpx] [-l nline]\n"
msgstr "Uso: col [-bfpx] [-l nline]\n"
#: text-utils/col.c:541
#, c-format
@ -9343,7 +9343,7 @@ msgstr "-- linea già svuotata"
#: text-utils/colcrt.c:97
#, c-format
msgid "usage: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "uso: %s [ - ] [ -2 ] [ file ... ]\n"
msgstr "Uso: %s [ - ] [ -2 ] [ file ... ]\n"
#: text-utils/column.c:297
msgid "line too long"
@ -9352,7 +9352,7 @@ msgstr "linea troppo lunga"
#: text-utils/column.c:374
#, c-format
msgid "usage: column [-tx] [-c columns] [file ...]\n"
msgstr "uso: column [-tx] [-c colonne] [file ...]\n"
msgstr "Uso: column [-tx] [-c colonne] [file ...]\n"
#: text-utils/hexsyntax.c:82
#, c-format
@ -9398,7 +9398,7 @@ msgid ""
"\n"
msgstr ""
"\n"
"******** %s: non è un file di testo********\n"
"******** %s: non è un file di testo ********\n"
"\n"
#: text-utils/more.c:617
@ -9686,7 +9686,7 @@ msgstr "Impossibile allocare lo spazio buffer\n"
#: text-utils/rev.c:156
#, c-format
msgid "usage: rev [file ...]\n"
msgstr "uso: rev [file ...]\n"
msgstr "Uso: rev [file ...]\n"
#: text-utils/tailf.c:53 text-utils/tailf.c:105
#, c-format

BIN
po/ja.gmo

Binary file not shown.

995
po/ja.po

File diff suppressed because it is too large Load Diff

BIN
po/nl.gmo

Binary file not shown.

1043
po/nl.po

File diff suppressed because it is too large Load Diff

Binary file not shown.

File diff suppressed because it is too large Load Diff

BIN
po/ru.gmo

Binary file not shown.

1045
po/ru.po

File diff suppressed because it is too large Load Diff

BIN
po/sl.gmo

Binary file not shown.

3559
po/sl.po

File diff suppressed because it is too large Load Diff

BIN
po/sv.gmo

Binary file not shown.

1039
po/sv.po

File diff suppressed because it is too large Load Diff

BIN
po/tr.gmo

Binary file not shown.

1043
po/tr.po

File diff suppressed because it is too large Load Diff

BIN
po/uk.gmo

Binary file not shown.

993
po/uk.po

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

BIN
po/vi.gmo

Binary file not shown.

1043
po/vi.po

File diff suppressed because it is too large Load Diff

View File

@ -570,10 +570,13 @@ dist-info: $(INFO_DEPS)
$(srcdir)/*) base=`echo "$$base" | sed "s|^$$srcdirstrip/||"`;; \
esac; \
if test -f $$base; then d=.; else d=$(srcdir); fi; \
for file in $$d/$$base*; do \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
test -f $(distdir)/$$relfile || \
cp -p $$file $(distdir)/$$relfile; \
base_i=`echo "$$base" | sed 's|\.info$$||;s|$$|.i|'`; \
for file in $$d/$$base $$d/$$base-[0-9] $$d/$$base-[0-9][0-9] $$d/$$base_i[0-9] $$d/$$base_i[0-9][0-9]; do \
if test -f $$file; then \
relfile=`expr "$$file" : "$$d/\(.*\)"`; \
test -f $(distdir)/$$relfile || \
cp -p $$file $(distdir)/$$relfile; \
else :; fi; \
done; \
done

View File

@ -1,7 +1,7 @@
.\" $Id: flock.1,v 1.2 2005/07/09 21:34:44 hpa Exp $
.\" $Id: flock.1,v 1.3 2006/02/04 20:41:57 hpa Exp $
.\" -----------------------------------------------------------------------
.\"
.\" Copyright 2003 H. Peter Anvin - All Rights Reserved
.\" Copyright 2003-2006 H. Peter Anvin - All Rights Reserved
.\"
.\" Permission is hereby granted, free of charge, to any person
.\" obtaining a copy of this software and associated documentation
@ -25,7 +25,7 @@
.\" OTHER DEALINGS IN THE SOFTWARE.
.\"
.\" -----------------------------------------------------------------------
.TH FLOCK "1" "17 Mar 2003" "flock utility" "H. Peter Anvin"
.TH FLOCK "1" "4 Feb 2006" "flock utility" "H. Peter Anvin"
.SH NAME
flock \- Manage locks from shell scripts
.SH SYNOPSIS
@ -69,7 +69,7 @@ waits until the lock is available.
\fB\-s\fP, \fB\-\-shared\fP
Obtain a shared lock, sometimes called a read lock.
.TP
\fB\-x\fP, \fB\-\-exclusive\fP
\fB\-x\fP, \fB\-e\fP, \fB\-\-exclusive\fP
Obtain an exclusive lock, sometimes called a write lock. This is the
default.
.TP
@ -80,11 +80,11 @@ required in special cases, for example if the enclosed command group
may have forked a background process which should not be holding the
lock.
.TP
\fB\-n\fP, \fB\-\-nonblock\fP
\fB\-n\fP, \fB\-\-nb\fP, \fB\-\-nonblock\fP
Fail (with an exit code of 1) rather than wait if the lock cannot be
immediately acquired.
.TP
\fB\-w\fP, \fB\-\-timeout\fP \fIseconds\fP
\fB\-w\fP, \fB\-\-wait\fP, \fB\-\-timeout\fP \fIseconds\fP
Fail (with an exit code of 1) if the lock cannot be acquired within
\fIseconds\fP seconds. Decimal fractional values are allowed.
.TP
@ -93,12 +93,15 @@ Close the file descriptor on which the lock is held before executing
\fIcommand\fP. This is useful if \fIcommand\fP spawns a child process
which should not be hold ing the lock.
.TP
\fB\-c\fP, \fB\-\-command\fP \fIcommand\fP
Pass a single \fIcommand\fP to the shell with \fB\-c\fP.
.TP
\fB\-h\fP, \fB\-\-help\fP
Print a help message.
.SH AUTHOR
Written by H. Peter Anvin <hpa@zytor.com>.
.SH COPYRIGHT
Copyright \(co 2003\-2005 H. Peter Anvin.
Copyright \(co 2003\-2006 H. Peter Anvin.
.br
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

View File

@ -61,10 +61,10 @@ static void usage(int ex)
{
fprintf(stderr,
"flock (%s)\n"
"Usage: %s [-seun][-w #] fd#\n"
" %s [-seon][-w #] file [-c] command...\n"
"Usage: %s [-sxun][-w #] fd#\n"
" %s [-sxon][-w #] file [-c] command...\n"
" -s --shared Get a shared lock\n"
" -e --exclusive Get an exclusive lock\n"
" -x --exclusive Get an exclusive lock\n"
" -u --unlock Remove a lock\n"
" -n --nonblock Fail rather than wait\n"
" -w --timeout Wait for a limited amount of time\n"