diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-02-21 13:30:51 +0200 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2009-02-21 13:31:26 +0200 |
commit | 1213cf065e9b3a5fb45d00276b3d168462838c17 (patch) | |
tree | 8d8f3cb7617465139f0051c10ef80fa9c2c91369 | |
parent | 5bfe69d55cff8940fd3a84ff479e6e8308b164f4 (diff) | |
download | wydawca-1213cf065e9b3a5fb45d00276b3d168462838c17.tar.gz wydawca-1213cf065e9b3a5fb45d00276b3d168462838c17.tar.bz2 |
Remove trailing whitespace
-rw-r--r-- | doc/Makefile.am | 4 | ||||
-rwxr-xr-x | doc/check-docs.sh | 6 | ||||
-rw-r--r-- | doc/mastermenu.el | 4 | ||||
-rw-r--r-- | doc/rendition.texi | 2 | ||||
-rw-r--r-- | doc/wydawca.texi | 144 | ||||
-rw-r--r-- | src/builtin.c | 22 | ||||
-rw-r--r-- | src/cmdline.opt | 2 | ||||
-rw-r--r-- | src/config.c | 94 | ||||
-rw-r--r-- | src/directive.c | 36 | ||||
-rw-r--r-- | src/diskio.c | 76 | ||||
-rw-r--r-- | src/exec.c | 12 | ||||
-rw-r--r-- | src/getopt.m4 | 60 | ||||
-rw-r--r-- | src/gpg.c | 34 | ||||
-rw-r--r-- | src/interval.c | 8 | ||||
-rw-r--r-- | src/mail.c | 30 | ||||
-rw-r--r-- | src/method.c | 22 | ||||
-rw-r--r-- | src/process.c | 18 | ||||
-rw-r--r-- | src/sql.c | 14 | ||||
-rw-r--r-- | src/triplet.c | 48 | ||||
-rw-r--r-- | src/verify.c | 22 | ||||
-rw-r--r-- | src/wydawca.c | 46 | ||||
-rw-r--r-- | src/wydawca.h | 18 | ||||
-rw-r--r-- | tests/Makefile.am | 4 | ||||
-rw-r--r-- | tests/atlocal.in | 2 | ||||
-rw-r--r-- | tests/mailstats.at | 26 |
25 files changed, 377 insertions, 377 deletions
diff --git a/doc/Makefile.am b/doc/Makefile.am index 7afd676..0ef1e64 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -55,3 +55,3 @@ check-options: $(MAKEINFO) $(AM_MAKEINFOFLAGS) $(MAKEINFOFLAGS) -I $(srcdir) -E - \ - $(info_TEXINFOS) + $(info_TEXINFOS) @@ -95,3 +95,3 @@ all-check-docs: check-format check-options check-refs check-fixmes check-unrevis -check-docs: +check-docs: $(MAKE) -k all-check-docs diff --git a/doc/check-docs.sh b/doc/check-docs.sh index c0b0487..16b6b0e 100755 --- a/doc/check-docs.sh +++ b/doc/check-docs.sh @@ -44,3 +44,3 @@ do shift -done +done @@ -59,3 +59,3 @@ join -v2 $TEMPDIR/src $TEMPDIR/doc > $TEMPDIR/doc-src echo "Not documented $item:" - cat $TEMPDIR/src-doc + cat $TEMPDIR/src-doc fi @@ -66,3 +66,3 @@ join -v2 $TEMPDIR/src $TEMPDIR/doc > $TEMPDIR/doc-src -if [ -s $TEMPDIR/report ]; then +if [ -s $TEMPDIR/report ]; then cat $TEMPDIR/report diff --git a/doc/mastermenu.el b/doc/mastermenu.el index 3ab3341..a38e824 100644 --- a/doc/mastermenu.el +++ b/doc/mastermenu.el @@ -28,3 +28,3 @@ -;; Known bugs: @menu without previous sectioning command will inherit +;; Known bugs: @menu without previous sectioning command will inherit ;; documentation string from the previous menu. However, since such a @@ -32,3 +32,3 @@ -(require 'texinfo) +(require 'texinfo) (require 'texnfo-upd) diff --git a/doc/rendition.texi b/doc/rendition.texi index 016583d..c4092ea 100644 --- a/doc/rendition.texi +++ b/doc/rendition.texi @@ -3,3 +3,3 @@ @c whether FIXME information should be placed in footnotes or -@c inlined. +@c inlined. diff --git a/doc/wydawca.texi b/doc/wydawca.texi index 3f5a682..876a8fa 100644 --- a/doc/wydawca.texi +++ b/doc/wydawca.texi @@ -161,3 +161,3 @@ to scan the source directories, gather the triplets, verify them, and to move any files that had passed the verification successfully to -their distribution sites. +their distribution sites. @@ -267,3 +267,3 @@ configuration file is @file{@var{sysconfdir}/wydawca.rc}, but if it is located elsewhere, you can specify its new location with the -@option{--config-file} (@option{-c}) command line option. +@option{--config-file} (@option{-c}) command line option. @@ -310,3 +310,3 @@ debugging level currently is 4, which prints an impractically big amount of information, which is useful mainly for @command{wydawca} -developers. +developers. @@ -323,3 +323,3 @@ further by supplying additional @option{--debug} options. The @option{--dry-run} option is useful when testing new configurations, -for example: +for example: @@ -335,3 +335,3 @@ $ wydawca -c new.cfg --dry-run @option{--help} (@option{-h}) prints a short usage summary, and -@option{--version} (@option{-v}) prints program version number. +@option{--version} (@option{-v}) prints program version number. @@ -380,3 +380,3 @@ it appears at @dfn{the top level} or @dfn{its scope is global}. When it appears within a block statement, we say that @dfn{it has block -scope}. +scope}. @@ -404,3 +404,3 @@ You can request inclusion of any file into your configuration file using @code{include} statement. Its only argument supplies the name of -file to be included. For example: +file to be included. For example: @@ -454,3 +454,3 @@ runs @command{wydawca} in dry run mode, using configuration file @file{./test.rc}, and looking for include files in the current working -directory: +directory: @@ -474,3 +474,3 @@ its diagnostic messages. By default, the program uses the @samp{local1} facility. To change this, use @code{syslog-facility} -statement: +statement: @@ -490,3 +490,3 @@ values are: @samp{auth}, @samp{authpriv}, @samp{cron}, @samp{daemon}, @samp{mail}. These names are case-insensitive and may be optionally -prefixed with @samp{log_} (case-insensitive as well). +prefixed with @samp{log_} (case-insensitive as well). @@ -527,3 +527,3 @@ releases). A database is defined using @code{sql} block statement. It has the -following syntax: +following syntax: @@ -599,3 +599,3 @@ in the table below: -@kwindex sql@r{, access method type} +@kwindex sql@r{, access method type} @item sql @@ -607,3 +607,3 @@ in the table below: Retrieve data using an external program. This method is reserved for -future use. +future use. @end table @@ -626,3 +626,3 @@ the configuration file, or inside a @code{directory} statement pairs in the configuration file, and ones inside a @code{directory} -statement override them for that particular directory pair. +statement override them for that particular directory pair. @@ -669,4 +669,4 @@ by @var{method-name} in the syntax above) used by on the database structure used in -@uref{http://gna.org/projects/savane, @command{Savane} system}. - +@uref{http://gna.org/projects/savane, @command{Savane} system}. + @deffn {Access Method} gpg-key @@ -678,3 +678,3 @@ return exactly one string. The sample definition is: - + @smallexample @@ -685,3 +685,3 @@ gpg-key sql default SELECT gpg_key \ @end deffn - + @deffn {Access Method} project-owner @@ -689,3 +689,3 @@ gpg-key sql default SELECT gpg_key \ @dfn{owners}) of a project. It may return any number of rows, each one -consisting of two columns: an email address and a user name, in this order. +consisting of two columns: an email address and a user name, in this order. @@ -706,3 +706,3 @@ project-owner sql default SELECT user.email, user.realname \ return one tuple, consisting of two columns: an email address and a user -name, in this order. +name, in this order. @@ -716,3 +716,3 @@ user-data sql default SELECT email, realname \ @end deffn - + @deffn {Access Method} verify-user @@ -724,5 +724,5 @@ make uploads. administrators: - + @smallexample -@group +@group verify-user sql default SELECT user.user_name \ @@ -752,3 +752,3 @@ warning messages: sendfile: copying @var{source} to @var{dest} failed: Invalid value - + sendfile: copying @var{source} to @var{dest} failed: Function not @@ -767,3 +767,3 @@ enable-sendfile no @command{wydawca} for Linux kernels starting from version 2.6.9 and -higher. +higher. @@ -779,3 +779,3 @@ file, and then put the new one in its place. Moreover, the directive file format allows maintainers to explicitly require archivation of -their existing files. +their existing files. @@ -788,6 +788,6 @@ appear either in the global scope, in which case it affects all directory pairs, or within a @code{directory} block (@pxref{directory -pairs}), where it affects only the given directory pair. +pairs}), where it affects only the given directory pair. This statement takes several arguments. The first argument specifies -the archivation type: +the archivation type: @@ -797,3 +797,3 @@ the archivation type: Disable archivation. - + @kwindex tar@r{, archivation} @@ -801,3 +801,3 @@ the archivation type: Use @command{tar} archive. - + @kwindex directory@r{, archivation} @@ -833,3 +833,3 @@ be created under it. For example, given this configuration: @smallexample -archive directory /var/backups/gnu +archive directory /var/backups/gnu @end smallexample @@ -839,3 +839,3 @@ all files from @file{/home/@/ftp/@/gnu/@/tar} will be archived in @file{/var/@/backups/@/gnu/@/tar}, and files from -@file{/home/@/ftp/@/gnu/@/tar/@/old} +@file{/home/@/ftp/@/gnu/@/tar/@/old} will be archived in @file{/var/@/backups/@/gnu/@/tar/@/old}, etc. @@ -854,3 +854,3 @@ directory @file{/home/@/ftp/@/gnu/@/tar/@/.archive}, files from @file{/home/@/ftp/@/gnu/@/tar/@/old} --- in -@file{/home/@/ftp/@/gnu/@/tar/@/.archive/@/old}, etc. +@file{/home/@/ftp/@/gnu/@/tar/@/.archive/@/old}, etc. @@ -888,3 +888,3 @@ Always make simple backups. @vindex VERSION_CONTROL - If no backup method is given, the value of the @env{VERSION_CONTROL} + If no backup method is given, the value of the @env{VERSION_CONTROL} environment variable will be used. And if @env{VERSION_CONTROL} is @@ -898,3 +898,3 @@ enforce this rule, @command{wydawca} implements @dfn{implicit signature archivation} facility. It works as -follows. When archivation of @var{file} is requested by +follows. When archivation of @var{file} is requested by @code{archive: @var{file}} statement in the directive @@ -941,6 +941,6 @@ corresponding global definition for this directory pair. A @code{directory} statement ends with the @code{end} keyword on a -separate line. +separate line. For example, the following definition says that valid uploads to -@file{/home/ftp/incoming/ftp} should be transferred to @file{/home/ftp/gnu}: +@file{/home/ftp/incoming/ftp} should be transferred to @file{/home/ftp/gnu}: @@ -1007,3 +1007,3 @@ unique configuration keyword is associated with it. The statistics items and their corresponding keywords are described in the table -below: +below: @@ -1102,3 +1102,3 @@ keywords, which are in this case @emph{excluded} from the summary. For example, to output all statistics, except errors and -warnings one would set: +warnings one would set: @@ -1158,3 +1158,3 @@ mailer @var{url} Two protocol specifications are currently supported: @samp{sendmail} -and @samp{smtp}. The former means to use a +and @samp{smtp}. The former means to use a @command{sendmail}-compatible program to send mails. Such a program @@ -1191,3 +1191,3 @@ specification only (@samp{sendmail:}) is also allowed. It means macro in your @file{/usr/include/paths.h} file''. This is the default -mailer. +mailer. @@ -1198,3 +1198,3 @@ server, and, optionally, the port number. If the port number is present, it is separated from the rest of @acronym{URL} by a colon. -For example: +For example: @@ -1286,3 +1286,3 @@ zero. For example, the following statement requires sending notifications only if there occurred any errors or access violation -attempts, or any bad signature was uploaded: +attempts, or any bad signature was uploaded: @@ -1323,7 +1323,7 @@ processed. in the source directory. -@kwindex stat:bad_triplets +@kwindex stat:bad_triplets @item stat:bad_triplets @tab Number of bad triplets seen. @kwindex stat:expired_triplets -@item stat:expired_triplets @tab Number of expired triplets. -@kwindex stat:triplet_success +@item stat:expired_triplets @tab Number of expired triplets. +@kwindex stat:triplet_success @item stat:triplet_success @tab Number of successfully processed @@ -1349,6 +1349,6 @@ caused the following results: -errors ............................. %@{stat:errors@} -warning ............................ %@{stat:warnings@} -bad signatures ..................... %@{stat:bad_signatures@} -access violation attempts .......... %@{stat:access_violations@} +errors ............................. %@{stat:errors@} +warning ............................ %@{stat:warnings@} +bad signatures ..................... %@{stat:bad_signatures@} +access violation attempts .......... %@{stat:access_violations@} @@ -1356,3 +1356,3 @@ Regards, Wydawca -end +end @end smallexample @@ -1367,3 +1367,3 @@ concerned: the system administrator, project administrators, or the user that initiated the upload: - + @table @code @@ -1372,3 +1372,3 @@ the user that initiated the upload: Successful upload. - + @kwindex bad-ownership @@ -1376,3 +1376,3 @@ the user that initiated the upload: An unauthorized user attempted to upload files for their project. - + @kwindex bad-directive-signature @@ -1381,3 +1381,3 @@ the user that initiated the upload: uploader. - + @kwindex bad-detached-signature @@ -1388,6 +1388,6 @@ uploader. -@kwindex notify-event +@kwindex notify-event These notifications are configured using the following statement: -@smallexample +@smallexample notify-event @var{event} @var{who} @var{msg-id} @@ -1424,3 +1424,3 @@ notify-event bad-directive-signature owner owner-bad-directive-signature @end smallexample - + The following macro-variables may be used in templates for these @@ -1466,3 +1466,3 @@ See below for an example. @item triplet:upload -Listing of the uploaded files (see below). +Listing of the uploaded files (see below). @@ -1506,3 +1506,3 @@ example, here is a possible @code{%@{triplet:full@}} listing: - + @@ -1510,3 +1510,3 @@ example, here is a possible @code{%@{triplet:full@}} listing: for the user: - + @smallexample @@ -1573,3 +1573,3 @@ For @samp{directive} archivation type, the optional @var{backup-method} parameter specifies how to back up an existing file whose name -coincides with the one @command{wydawca} is about to create. If +coincides with the one @command{wydawca} is about to create. If @var{backup-method} is not specified, the value of the @env{VERSION_CONTROL} @@ -1602,3 +1602,3 @@ Always make simple backups. @deffn {Wydawca Statement} syslog-facility @var{facility} -Output diagnostics to the given syslog facility. The @var{facility} +Output diagnostics to the given syslog facility. The @var{facility} may be one of the following: @samp{user}, @samp{daemon}, @samp{auth}, @@ -1686,3 +1686,3 @@ the same way we do this in English: it consists of one or more pairs ``@samp{number} @samp{time unit}''. For example, the following are -valid interval specifications: +valid interval specifications: @@ -1714,3 +1714,3 @@ not an absolute file name, it will be searched in @env{PATH}. @deffn {Wydawca Block Statement} sql @var{identifier} -This statement begins a MySQL database definition. It may contain +This statement begins a MySQL database definition. It may contain several sub-statements, defining how to access the database. The @@ -1782,3 +1782,3 @@ end @end smallexample - + @noindent @@ -1790,3 +1790,3 @@ any optional archive and/or access method definitions, overriding the global ones for this directory pair. - + @xref{directory pairs}, for more information. @@ -1848,3 +1848,3 @@ Sets the sender address for mail notifications. -@deffn {Wydawca Statement} mail-admin-stat @var{msg-id} @var{condition-list} +@deffn {Wydawca Statement} mail-admin-stat @var{msg-id} @var{condition-list} Defines statistics categories that trigger statistic reports. @@ -1885,3 +1885,3 @@ Sets the mailer @acronym{URL} to use. This chapter presents a short reference of all @command{wydawca} -command line options, in alphabetical order. +command line options, in alphabetical order. @@ -1905,3 +1905,3 @@ Log all diagnostics to syslog. @opsummary{debug} -@item --debug +@item --debug @itemx -d @@ -1949,3 +1949,3 @@ Print a concise usage summary and exit. @opsummary{version} -@item --version +@item --version @itemx -v @@ -1964,3 +1964,3 @@ information needed is: @itemize -@item Program version you use (see the output of @command{wydawca --version}. +@item Program version you use (see the output of @command{wydawca --version}. @item A description of the bug. diff --git a/src/builtin.c b/src/builtin.c index 7d2c276..761a01a 100644 --- a/src/builtin.c +++ b/src/builtin.c @@ -50,3 +50,3 @@ builtin_open (struct access_method *meth) #define STRMATCH(s, p, len) \ - (len == sizeof(s) - 1 && memcmp (s, p, sizeof(s) - 1) == 0) + (len == sizeof(s) - 1 && memcmp (s, p, sizeof(s) - 1) == 0) @@ -91,3 +91,3 @@ cmp_regex (const char *pat, const char *str, int flags) return rc == 0; -} +} @@ -99,3 +99,3 @@ parse_cmp_type (const char *pat, strcmp_fn *cmpfn, int *rf) int cmp; - + if (STRMATCH ("exact", pat, len)) @@ -119,3 +119,3 @@ parse_cmp_type (const char *pat, strcmp_fn *cmpfn, int *rf) break; - + case 'b': @@ -123,3 +123,3 @@ parse_cmp_type (const char *pat, strcmp_fn *cmpfn, int *rf) break; - + default: @@ -176,3 +176,3 @@ builtin_run (struct access_method *meth, void *handle, const char *req) int ncol = default_ncol[meth->id]; - + if (meth->parmc == 0) @@ -184,3 +184,3 @@ builtin_run (struct access_method *meth, void *handle, const char *req) obstack_init (&stk); - + for (i = 0; i < meth->parmc; i++) @@ -189,3 +189,3 @@ builtin_run (struct access_method *meth, void *handle, const char *req) char *val; - + if (pat[0] == '/') @@ -199,3 +199,3 @@ builtin_run (struct access_method *meth, void *handle, const char *req) break; - + if (cmpfn (pat, req, flags)) @@ -241,5 +241,5 @@ builtin_run (struct access_method *meth, void *handle, const char *req) } - + meth->storage = bds; - + return rc; diff --git a/src/cmdline.opt b/src/cmdline.opt index 5b3ed22..cb269f6 100644 --- a/src/cmdline.opt +++ b/src/cmdline.opt @@ -82,3 +82,3 @@ BEGIN preprocess_only = 1; -END +END diff --git a/src/config.c b/src/config.c index 61cf324..c22074f 100644 --- a/src/config.c +++ b/src/config.c @@ -40,3 +40,3 @@ static struct notification *default_notification = NULL; ../file --> NULL -*/ +*/ char * @@ -46,3 +46,3 @@ safe_file_name (char *file_name) char *p; - + if (!file_name) @@ -101,3 +101,3 @@ safe_file_name (char *file_name) } - + p++; @@ -132,3 +132,3 @@ string_to (const char *what, const char *str, ptrdiff_t x = ARGMATCH (str, args, vals); - + if (x == (ptrdiff_t)-1) @@ -252,3 +252,3 @@ get_arg (gconf_locus_t *locus, gconf_value_t *value, unsigned n, int type) } - + @@ -291,3 +291,3 @@ cb_email_address (enum gconf_callback_command cmd, mu_address_t addr; - + if (assert_string_arg (locus, cmd, value)) @@ -312,3 +312,3 @@ cb_interval (enum gconf_callback_command cmd, const char *endp; - + /* FIXME 1: Support arrays */ @@ -335,3 +335,3 @@ cb_absolute_name (enum gconf_callback_command cmd, char *word; - + /* FIXME 1: Support arrays */ @@ -357,3 +357,3 @@ cb_set_umask (enum gconf_callback_command cmd, mode_t m; - + if (assert_string_arg (locus, cmd, value)) @@ -410,3 +410,3 @@ parse_single_statmask (gconf_locus_t *locus, const gconf_value_t *val, ptrdiff_t x; - + if (val->type != GCONF_TYPE_STRING) @@ -416,3 +416,3 @@ parse_single_statmask (gconf_locus_t *locus, const gconf_value_t *val, } - + arg = val->v.string; @@ -431,5 +431,5 @@ parse_single_statmask (gconf_locus_t *locus, const gconf_value_t *val, } - + x = ARGMATCH (arg, stat_args, stat_types); - + if (x == (ptrdiff_t)-1) @@ -460,3 +460,3 @@ parse_statmask (gconf_locus_t *loc, gconf_value_t *val, unsigned long *pmask) break; - + case GCONF_TYPE_ARRAY: @@ -464,3 +464,3 @@ parse_statmask (gconf_locus_t *loc, gconf_value_t *val, unsigned long *pmask) int i; - + for (i = 0; i < val->v.arg.c; i++) @@ -487,3 +487,3 @@ parse_statmask (gconf_locus_t *loc, gconf_value_t *val, unsigned long *pmask) unsigned long x; - + if (parse_single_statmask (loc, vp, &x, &invert)) @@ -502,3 +502,3 @@ parse_statmask (gconf_locus_t *loc, gconf_value_t *val, unsigned long *pmask) } - + static int @@ -523,3 +523,3 @@ cb_sql_host (enum gconf_callback_command cmd, char *p; - + if (assert_string_arg (locus, cmd, value)) @@ -571,3 +571,3 @@ cb_sql (enum gconf_callback_command cmd, void **pdata = cb_data; - + switch (cmd) { @@ -596,3 +596,3 @@ cb_sql (enum gconf_callback_command cmd, } - + static struct gconf_keyword sql_kw[] = { @@ -635,3 +635,3 @@ cb_define_message (enum gconf_callback_command cmd, const char *ident; - + if (cmd != gconf_callback_set_value) @@ -663,4 +663,4 @@ cb_define_message (enum gconf_callback_command cmd, } - - + + @@ -679,3 +679,3 @@ static struct gconf_keyword syslog_kw[] = { }; - + @@ -743,3 +743,3 @@ cb_backup (enum gconf_callback_command cmd, enum backup_type *ptype = varptr; - + if (assert_string_arg (locus, cmd, value)) @@ -780,3 +780,3 @@ cb_archive (enum gconf_callback_command cmd, } - + if (value->type != GCONF_TYPE_STRING) @@ -786,3 +786,3 @@ cb_archive (enum gconf_callback_command cmd, } - + if (strcmp (value->v.string, "none") == 0) @@ -808,3 +808,3 @@ cb_archive (enum gconf_callback_command cmd, return 0; - + if (arch->name == NULL) @@ -820,3 +820,3 @@ cb_archive (enum gconf_callback_command cmd, } - + return 0; @@ -844,3 +844,3 @@ cb_event (enum gconf_callback_command cmd, enum notification_event *pev = varptr; - + if (assert_string_arg (locus, cmd, value)) @@ -859,3 +859,3 @@ cb_recipient (enum gconf_callback_command cmd, enum notification_target *tgt = varptr; - + if (assert_string_arg (locus, cmd, value)) @@ -980,3 +980,3 @@ cb_access_method_params (enum gconf_callback_command cmd, meth->parmv = xcalloc (size + 1, sizeof (meth->parmv[0])); - + for (i = 0; gl_list_iterator_next (&itr, &p, NULL); i++) @@ -984,6 +984,6 @@ cb_access_method_params (enum gconf_callback_command cmd, const gconf_value_t *vp = p; - + if (assert_string_arg (locus, cmd, vp)) break; - + meth->parmv[i] = xstrdup (vp->v.string); @@ -1013,3 +1013,3 @@ string_to_access_method_id (gconf_locus_t *locus, "verify-user", - "gpg-key", + "gpg-key", "project-owner", @@ -1019,5 +1019,5 @@ string_to_access_method_id (gconf_locus_t *locus, static int id_num[] = { - verify_method, - gpg_key_method, - project_owner_method, + verify_method, + gpg_key_method, + project_owner_method, user_data_method @@ -1034,3 +1034,3 @@ string_to_access_method_id (gconf_locus_t *locus, } - + static int @@ -1045,3 +1045,3 @@ cb_access_method (enum gconf_callback_command cmd, enum access_method_id id; - + switch (cmd) { @@ -1077,3 +1077,3 @@ cb_access_method (enum gconf_callback_command cmd, break; - + default: @@ -1124,3 +1124,3 @@ cb_directory (enum gconf_callback_command cmd, int ec, i; - + switch (cmd) @@ -1177,3 +1177,3 @@ cb_directory (enum gconf_callback_command cmd, dpair->notification = default_notification; - + register_directory_pair (dpair); @@ -1182,3 +1182,3 @@ cb_directory (enum gconf_callback_command cmd, break; - + case gconf_callback_set_value: @@ -1198,3 +1198,3 @@ static struct gconf_keyword wydawca_kw[] = { gconf_type_string, &from_address, 0, cb_email_address }, - + { "enable-sendfile", N_("arg"), N_("Enable or disable sendfile(2) support"), @@ -1242,3 +1242,3 @@ static struct gconf_keyword wydawca_kw[] = { cb_directory, NULL, directory_kw }, - + { NULL } @@ -1260,3 +1260,3 @@ config_init() int i; - + gconf_set_keywords (wydawca_kw); diff --git a/src/directive.c b/src/directive.c index ec06f15..d99f65b 100644 --- a/src/directive.c +++ b/src/directive.c @@ -30,3 +30,3 @@ directive_parse (struct file_triplet *trp) trp->file[file_directive].name, trp->blurb); - + dcount = 0; @@ -35,3 +35,3 @@ directive_parse (struct file_triplet *trp) dcount++; - + trp->directive = xcalloc (dcount + 1, sizeof trp->directive[0]); @@ -107,3 +107,3 @@ _directive_seq_get (int n, struct file_triplet *trp, return 0; - + p = strchr (trp->directive[n], ':'); @@ -172,3 +172,3 @@ directive_version_in_range_p (struct file_triplet *trp, unsigned version; - + if (directive_get_value (trp, "version", &val)) @@ -189,3 +189,3 @@ directive_version_in_range_p (struct file_triplet *trp, return 1; - + logmsg (LOG_ERR, "%s: version %s is not in the allowed range", @@ -241,3 +241,3 @@ verify_directive_format (struct file_triplet *trp) const char *key; - + if (!directive_version_in_range_p (trp, MIN_DIRECTIVE_VERSION, @@ -279,6 +279,6 @@ verify_directive_format (struct file_triplet *trp) return 1; - } + } } } - + if (trp->file[file_dist].name && trp->file[file_signature].name) @@ -309,3 +309,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) char *relative_dir; - + UPDATE_STATS (STAT_COMPLETE_TRIPLETS); @@ -320,3 +320,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) abort (); - + case comment_dir: @@ -325,3 +325,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) break; - + case directory_dir: @@ -330,3 +330,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) { - logmsg (LOG_ERR, "%s: invalid directory: %s", + logmsg (LOG_ERR, "%s: invalid directory: %s", trp->file[file_directive].name, val); @@ -335,3 +335,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) break; - + case filename_dir: @@ -349,3 +349,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) break; - + case version_dir: @@ -353,3 +353,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) break; - + case archive_dir: @@ -371,3 +371,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) } - + if (argc != 2) @@ -381,3 +381,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) rc = symlink_file (trp, dpair, relative_dir, argv[0], argv[1]); - + argcv_free (argc, argv); @@ -387,3 +387,3 @@ process_directives (struct file_triplet *trp, struct directory_pair *dpair) break; - + case rmsymlink_dir: diff --git a/src/diskio.c b/src/diskio.c index 18f3960..e30b215 100644 --- a/src/diskio.c +++ b/src/diskio.c @@ -34,3 +34,3 @@ sub_dir_p (char *arg, char *dir) return 0; - + dlen = strlen (dir); @@ -51,3 +51,3 @@ concat_dir (const char *base, const char *name, size_t *pbaselen) char *dir; - + while (len > 0 && base[len-1] == '/') @@ -74,3 +74,3 @@ create_hierarchy (char *dir, size_t baselen, uid_t uid, gid_t gid) char *p; - + if (stat (dir, &st) == 0) @@ -89,3 +89,3 @@ create_hierarchy (char *dir, size_t baselen, uid_t uid, gid_t gid) } - + p = strrchr (dir, '/'); @@ -164,3 +164,3 @@ copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid) } - + out_fd = creat (dst_file, CREAT_PERMISSIONS); @@ -173,3 +173,3 @@ copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid) } - + #ifdef USE_SENDFILE @@ -179,3 +179,3 @@ copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid) ssize_t count; - + count = sendfile (out_fd, in_fd, &offset, st.st_size); @@ -207,3 +207,3 @@ copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid) size_t fsize = st.st_size; - + for (bufsize = fsize; bufsize > 0 && (buf = malloc (bufsize)) == NULL; @@ -219,3 +219,3 @@ copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid) size_t rdbytes; - + rest = fsize > bufsize ? bufsize : fsize; @@ -236,3 +236,3 @@ copy_file (const char *file, const char *dst_file, uid_t uid, gid_t gid) break; - } + } else if (rest != rdbytes) @@ -297,3 +297,3 @@ tar_append_file (const char *archive, const char *file) const char *argv[6]; - + if (debug_level) @@ -346,3 +346,3 @@ backup_file (const char *dst_file, const char *dst_dir, const char *file, char *file_name; - + if (archive->name[0] == '/') @@ -407,3 +407,3 @@ backup_file (const char *dst_file, const char *dst_dir, const char *file, return rc; -} +} @@ -423,3 +423,3 @@ do_archive_file (const char *dst_file, const char *dst_dir, const char *file, return backup_file (dst_file, dst_dir, file, archive, uid, gid, reldir); - + case archive_tar: @@ -444,3 +444,3 @@ int move_file (struct file_triplet *trp, struct directory_pair *dpair, - enum file_type file_id, const char *reldir) + enum file_type file_id, const char *reldir) { @@ -450,3 +450,3 @@ move_file (struct file_triplet *trp, struct directory_pair *dpair, TRIPLET_UID (trp), TRIPLET_GID (trp)); - + if (!dst_dir) @@ -454,3 +454,3 @@ move_file (struct file_triplet *trp, struct directory_pair *dpair, dst_file = concat_dir (dst_dir, trp->file[file_id].name, NULL); - + if (debug_level) @@ -463,3 +463,3 @@ move_file (struct file_triplet *trp, struct directory_pair *dpair, TRIPLET_UID (trp), TRIPLET_GID (trp), reldir); - + if (!dry_run_mode && rc == 0) @@ -467,3 +467,3 @@ move_file (struct file_triplet *trp, struct directory_pair *dpair, TRIPLET_UID (trp), TRIPLET_GID (trp)); - + free (dst_file); @@ -488,3 +488,3 @@ archive_single_file (struct file_triplet *trp, struct directory_pair *dpair, TRIPLET_UID (trp), TRIPLET_GID (trp)); |