aboutsummaryrefslogtreecommitdiffstats
path: root/util.c
diff options
context:
space:
mode:
authorWayne Davison <wayned@samba.org>2006-04-25 20:23:34 +0000
committerWayne Davison <wayned@samba.org>2006-04-25 20:23:34 +0000
commit0f78b81511be65d8fe21af1e6ac674f9e80ac29d (patch)
tree94c0e2c6ede275cc4374e8f2a5286f8ea8a6cdba /util.c
parentd051056f921f465c487a85f9fa29a2324332bc4b (diff)
downloadandroid_external_rsync-0f78b81511be65d8fe21af1e6ac674f9e80ac29d.tar.gz
android_external_rsync-0f78b81511be65d8fe21af1e6ac674f9e80ac29d.tar.bz2
android_external_rsync-0f78b81511be65d8fe21af1e6ac674f9e80ac29d.zip
- Updated the address for the FSF in the opening comment.
- Standardized the format of the opening comment, including adding a brief description of what's in the file for those that lacked it. - Added some missing copyright lines. - Some minor whitespace tweaks (in a few of the files).
Diffstat (limited to 'util.c')
-rw-r--r--util.c30
1 files changed, 10 insertions, 20 deletions
diff --git a/util.c b/util.c
index dcb48f5c..2ec56a7c 100644
--- a/util.c
+++ b/util.c
@@ -1,8 +1,10 @@
-/* -*- c-file-style: "linux" -*-
+/*
+ * Utility routines used in rsync.
*
- * Copyright (C) 1996-2000 by Andrew Tridgell
- * Copyright (C) Paul Mackerras 1996
- * Copyright (C) 2001, 2002 by Martin Pool <mbp@samba.org>
+ * Copyright (C) 1996-2000 Andrew Tridgell
+ * Copyright (C) 1996 Paul Mackerras
+ * Copyright (C) 2001, 2002 Martin Pool <mbp@samba.org>
+ * Copyright (C) 2003, 2004, 2005, 2006 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -16,15 +18,9 @@
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
-/**
- * @file
- *
- * Utilities used in rsync
- **/
-
#include "rsync.h"
extern int verbose;
@@ -39,11 +35,7 @@ extern struct filter_list_struct server_filter_list;
int sanitize_paths = 0;
-
-
-/**
- * Set a fd into nonblocking mode
- **/
+/* Set a fd into nonblocking mode. */
void set_nonblocking(int fd)
{
int val;
@@ -56,9 +48,7 @@ void set_nonblocking(int fd)
}
}
-/**
- * Set a fd into blocking mode
- **/
+/* Set a fd into blocking mode. */
void set_blocking(int fd)
{
int val;
@@ -759,7 +749,7 @@ unsigned int clean_fname(char *name, BOOL collapse_dot_dot)
* of the path. Use -1 to allow unlimited depth.
*
* We also clean the path in a manner similar to clean_fname() but with a
- * few differences:
+ * few differences:
*
* Turns multiple adjacent slashes into a single slash, gets rid of "." dir
* elements (INCLUDING a trailing dot dir), PRESERVES a trailing slash, and