summaryrefslogtreecommitdiffstats
path: root/gnu/usr.bin/cpio
diff options
context:
space:
mode:
authorrgrimes <rgrimes@FreeBSD.org>1995-05-30 05:05:38 +0000
committerrgrimes <rgrimes@FreeBSD.org>1995-05-30 05:05:38 +0000
commit2ad6f3dee6bc54535003f4ab26bbc587b7efa38c (patch)
treea3959baf797787918878bec6d58d6a0fb743ad0a /gnu/usr.bin/cpio
parent4f960dd75f181e9fa2edc44324f15f0ab5c64b37 (diff)
downloadFreeBSD-src-2ad6f3dee6bc54535003f4ab26bbc587b7efa38c.zip
FreeBSD-src-2ad6f3dee6bc54535003f4ab26bbc587b7efa38c.tar.gz
Remove trailing whitespace.
Diffstat (limited to 'gnu/usr.bin/cpio')
-rw-r--r--gnu/usr.bin/cpio/copyin.c42
-rw-r--r--gnu/usr.bin/cpio/copyout.c12
-rw-r--r--gnu/usr.bin/cpio/copypass.c16
-rw-r--r--gnu/usr.bin/cpio/idcache.c2
-rw-r--r--gnu/usr.bin/cpio/makepath.c2
-rw-r--r--gnu/usr.bin/cpio/tar.c4
-rw-r--r--gnu/usr.bin/cpio/util.c20
7 files changed, 49 insertions, 49 deletions
diff --git a/gnu/usr.bin/cpio/copyin.c b/gnu/usr.bin/cpio/copyin.c
index 5196c5d..8094a7b 100644
--- a/gnu/usr.bin/cpio/copyin.c
+++ b/gnu/usr.bin/cpio/copyin.c
@@ -449,18 +449,18 @@ process_copy_in ()
{
struct new_cpio_header *h;
h = &file_hdr;
- fprintf (stderr,
+ fprintf (stderr,
"magic = 0%o, ino = %d, mode = 0%o, uid = %d, gid = %d\n",
h->c_magic, h->c_ino, h->c_mode, h->c_uid, h->c_gid);
- fprintf (stderr,
+ fprintf (stderr,
"nlink = %d, mtime = %d, filesize = %d, dev_maj = 0x%x\n",
h->c_nlink, h->c_mtime, h->c_filesize, h->c_dev_maj);
- fprintf (stderr,
+ fprintf (stderr,
"dev_min = 0x%x, rdev_maj = 0x%x, rdev_min = 0x%x, namesize = %d\n",
h->c_dev_min, h->c_rdev_maj, h->c_rdev_min, h->c_namesize);
- fprintf (stderr,
+ fprintf (stderr,
"chksum = %d, name = \"%s\", tar_linkname = \"%s\"\n",
- h->c_chksum, h->c_name,
+ h->c_chksum, h->c_name,
h->c_tar_linkname ? h->c_tar_linkname : "(null)" );
}
@@ -570,7 +570,7 @@ process_copy_in ()
skip_padding (in_file_des, file_hdr.c_filesize);
continue; /* Go to the next file. */
}
- else if (S_ISDIR (file_stat.st_mode)
+ else if (S_ISDIR (file_stat.st_mode)
? rmdir (file_hdr.c_name)
: unlink (file_hdr.c_name))
{
@@ -617,7 +617,7 @@ process_copy_in ()
but GNU cpio version 2.0-2.2 didn't do that, so we
still have to check for links here (and also in case
the archive was created and later appeneded to). */
- link_res = link_to_maj_min_ino (file_hdr.c_name,
+ link_res = link_to_maj_min_ino (file_hdr.c_name,
file_hdr.c_dev_maj, file_hdr.c_dev_maj,
file_hdr.c_ino);
if (link_res == 0)
@@ -631,7 +631,7 @@ process_copy_in ()
&& archive_format != arf_ustar)
{
int link_res;
- link_res = link_to_maj_min_ino (file_hdr.c_name,
+ link_res = link_to_maj_min_ino (file_hdr.c_name,
file_hdr.c_dev_maj, file_hdr.c_dev_maj,
file_hdr.c_ino);
if (link_res == 0)
@@ -642,7 +642,7 @@ process_copy_in ()
}
}
else if ((archive_format == arf_tar || archive_format == arf_ustar)
- && file_hdr.c_tar_linkname &&
+ && file_hdr.c_tar_linkname &&
file_hdr.c_tar_linkname[0] != '\0')
{
int link_res;
@@ -725,8 +725,8 @@ process_copy_in ()
if (file_hdr.c_nlink > 1 && (archive_format == arf_newascii
|| archive_format == arf_crcascii) )
{
- /* (see comment above for how the newc and crc formats
- store multiple links). Now that we have the data
+ /* (see comment above for how the newc and crc formats
+ store multiple links). Now that we have the data
for this file, create any other links to it which
we defered. */
create_defered_links (&file_hdr);
@@ -758,7 +758,7 @@ process_copy_in ()
the name before creating it. */
cdf_char = strlen (file_hdr.c_name) - 1;
if ( (cdf_char > 0) &&
- (file_hdr.c_mode & 04000) &&
+ (file_hdr.c_mode & 04000) &&
(file_hdr.c_name [cdf_char] == '+') )
{
file_hdr.c_name [cdf_char] = '\0';
@@ -815,14 +815,14 @@ process_copy_in ()
&& archive_format != arf_ustar)
{
int link_res;
- link_res = link_to_maj_min_ino (file_hdr.c_name,
+ link_res = link_to_maj_min_ino (file_hdr.c_name,
file_hdr.c_dev_maj, file_hdr.c_dev_maj,
file_hdr.c_ino);
if (link_res == 0)
break;
}
else if (archive_format == arf_ustar &&
- file_hdr.c_tar_linkname &&
+ file_hdr.c_tar_linkname &&
file_hdr.c_tar_linkname [0] != '\0')
{
int link_res;
@@ -841,7 +841,7 @@ process_copy_in ()
}
break;
}
-
+
res = mknod (file_hdr.c_name, file_hdr.c_mode,
makedev (file_hdr.c_rdev_maj, file_hdr.c_rdev_min));
if (res < 0 && create_dir_flag)
@@ -1134,10 +1134,10 @@ skip_padding (in_file_des, offset)
}
-/* The newc and crc formats store multiply linked copies of the same file
- in the archive only once. The actual data is attached to the last link
- in the archive, and the other links all have a filesize of 0. When a
- file in the archive has multiple links and a filesize of 0, its data is
+/* The newc and crc formats store multiply linked copies of the same file
+ in the archive only once. The actual data is attached to the last link
+ in the archive, and the other links all have a filesize of 0. When a
+ file in the archive has multiple links and a filesize of 0, its data is
probably "attatched" to another file in the archive, so we can't create
it right away. We have to "defer" creating it until we have created
the file that has the data "attatched" to it. We keep a list of the
@@ -1223,11 +1223,11 @@ create_final_defers ()
struct utimbuf times; /* For setting file times. */
/* Initialize this in case it has members we don't know to set. */
bzero (&times, sizeof (struct utimbuf));
-
+
for (d = deferments; d != NULL; d = d->next)
{
d = deferments;
- link_res = link_to_maj_min_ino (d->header.c_name,
+ link_res = link_to_maj_min_ino (d->header.c_name,
d->header.c_dev_maj, d->header.c_dev_maj,
d->header.c_ino);
if (link_res == 0)
diff --git a/gnu/usr.bin/cpio/copyout.c b/gnu/usr.bin/cpio/copyout.c
index f763f2b..35682e1 100644
--- a/gnu/usr.bin/cpio/copyout.c
+++ b/gnu/usr.bin/cpio/copyout.c
@@ -149,8 +149,8 @@ write_out_header (file_hdr, out_des)
{
switch (file_hdr->c_mode & CP_IFMT)
{
- /* HP/UX cpio creates archives that look just like ordinary
- archives, but for devices it sets major = 0, minor = 1, and
+ /* HP/UX cpio creates archives that look just like ordinary
+ archives, but for devices it sets major = 0, minor = 1, and
puts the actual major/minor number in the filesize field. */
case CP_IFCHR:
case CP_IFBLK:
@@ -165,7 +165,7 @@ write_out_header (file_hdr, out_des)
short_hdr.c_rdev = makedev (0, 1);
break;
default:
- short_hdr.c_rdev = makedev (file_hdr->c_rdev_maj,
+ short_hdr.c_rdev = makedev (file_hdr->c_rdev_maj,
file_hdr->c_rdev_min);
break;
}
@@ -431,7 +431,7 @@ process_copy_out ()
file_hdr.c_dev_maj,
file_hdr.c_dev_min)))
{
- /* This file is linked to another file already in the
+ /* This file is linked to another file already in the
archive, so write it out as a hard link. */
file_hdr.c_mode = (file_stat.st_mode & 07777);
file_hdr.c_mode |= CP_IFREG;
@@ -439,7 +439,7 @@ process_copy_out ()
write_out_header (&file_hdr, out_file_des);
break;
}
- add_inode (file_hdr.c_ino, file_hdr.c_name,
+ add_inode (file_hdr.c_ino, file_hdr.c_name,
file_hdr.c_dev_maj, file_hdr.c_dev_min);
}
file_hdr.c_filesize = 0;
@@ -719,7 +719,7 @@ writeout_other_defers (file_hdr, out_des)
/* When writing newc and crc format archives we defer multiply linked
files until we have seen all of the links to the file. If a file
has links to it that aren't going into the archive, then we will
- never see the "last" link to the file, so at the end we just write
+ never see the "last" link to the file, so at the end we just write
all of the leftover defered files into the archive. */
static void
diff --git a/gnu/usr.bin/cpio/copypass.c b/gnu/usr.bin/cpio/copypass.c
index afd5753..0bf7c60 100644
--- a/gnu/usr.bin/cpio/copypass.c
+++ b/gnu/usr.bin/cpio/copypass.c
@@ -135,12 +135,12 @@ process_copy_pass ()
/* User said to link it if possible. Try and link to
the original copy. If that fails we'll still try
and link to a copy we've already made. */
- link_res = link_to_name (output_name.ds_string,
+ link_res = link_to_name (output_name.ds_string,
input_name.ds_string);
if ( (link_res < 0) && (in_file_stat.st_nlink > 1) )
- link_res = link_to_maj_min_ino (output_name.ds_string,
- major (in_file_stat.st_dev),
- minor (in_file_stat.st_dev),
+ link_res = link_to_maj_min_ino (output_name.ds_string,
+ major (in_file_stat.st_dev),
+ minor (in_file_stat.st_dev),
in_file_stat.st_ino);
#endif
@@ -275,10 +275,10 @@ process_copy_pass ()
Set link_name to the original file name. */
if (link_flag)
/* User said to link it if possible. */
- link_res = link_to_name (output_name.ds_string,
+ link_res = link_to_name (output_name.ds_string,
input_name.ds_string);
if ( (link_res < 0) && (in_file_stat.st_nlink > 1) )
- link_res = link_to_maj_min_ino (output_name.ds_string,
+ link_res = link_to_maj_min_ino (output_name.ds_string,
major (in_file_stat.st_dev),
minor (in_file_stat.st_dev),
in_file_stat.st_ino);
@@ -377,7 +377,7 @@ process_copy_pass ()
fprintf (stderr, "%d blocks\n", res);
}
-/* Try and create a hard link from FILE_NAME to another file
+/* Try and create a hard link from FILE_NAME to another file
with the given major/minor device number and inode. If no other
file with the same major/minor/inode numbers is known, add this file
to the list of known files and associated major/minor/inode numbers
@@ -411,7 +411,7 @@ link_to_maj_min_ino (file_name, st_dev_maj, st_dev_min, st_ino)
}
/* Try and create a hard link from LINK_NAME to LINK_TARGET. If
- `create_dir_flag' is set, any non-existent (parent) directories
+ `create_dir_flag' is set, any non-existent (parent) directories
needed by LINK_NAME will be created. If the link is successfully
created and `verbose_flag' is set, print "LINK_TARGET linked to LINK_NAME\n".
If the link can not be created and `link_flag' is set, print
diff --git a/gnu/usr.bin/cpio/idcache.c b/gnu/usr.bin/cpio/idcache.c
index dd9c366..341c9f4 100644
--- a/gnu/usr.bin/cpio/idcache.c
+++ b/gnu/usr.bin/cpio/idcache.c
@@ -199,7 +199,7 @@ getgidbyname (group)
group_alist = tail;
return &tail->id.g;
}
-
+
tail->next = nogroup_alist;
nogroup_alist = tail;
return 0;
diff --git a/gnu/usr.bin/cpio/makepath.c b/gnu/usr.bin/cpio/makepath.c
index bdf6829..b9c09d7 100644
--- a/gnu/usr.bin/cpio/makepath.c
+++ b/gnu/usr.bin/cpio/makepath.c
@@ -145,7 +145,7 @@ make_path (argpath, mode, parent_mode, owner, group, verbose_fmt_string)
`+' from the name and create the directory. Later
we will "hide" the directory. */
if ( (*(slash +1) == '/') && (*(slash -1) == '+') )
- {
+ {
iscdf = 1;
*(slash -1) = '\0';
}
diff --git a/gnu/usr.bin/cpio/tar.c b/gnu/usr.bin/cpio/tar.c
index 16eeee0..84cb0ad 100644
--- a/gnu/usr.bin/cpio/tar.c
+++ b/gnu/usr.bin/cpio/tar.c
@@ -297,14 +297,14 @@ read_in_tar_header (file_hdr, in_des)
/* If a POSIX tar header has a valid linkname it's always supposed
to set typeflag to be LNKTYPE. System V.4 tar seems to
be broken, and for device files with multiple links it
- puts the name of the link into linkname, but leaves typeflag
+ puts the name of the link into linkname, but leaves typeflag
as CHRTYPE, BLKTYPE, FIFOTYPE, etc. */
file_hdr->c_tar_linkname = stash_tar_linkname (tar_hdr->linkname);
/* Does POSIX say that the filesize must be 0 for devices? We
assume so, but HPUX's POSIX tar sets it to be 1 which causes
us problems (when reading an archive we assume we can always
- skip to the next file by skipping filesize bytes). For
+ skip to the next file by skipping filesize bytes). For
now at least, it's easier to clear filesize for devices,
rather than check everywhere we skip in copyin.c. */
file_hdr->c_filesize = 0;
diff --git a/gnu/usr.bin/cpio/util.c b/gnu/usr.bin/cpio/util.c
index 52e3e85..e2e1c1e 100644
--- a/gnu/usr.bin/cpio/util.c
+++ b/gnu/usr.bin/cpio/util.c
@@ -63,8 +63,8 @@ empty_output_buffer (out_des)
#ifdef BROKEN_LONG_TAPE_DRIVER
/* Some tape drivers seem to have a signed internal seek pointer and
- they lose if it overflows and becomes negative (e.g. when writing
- tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
+ they lose if it overflows and becomes negative (e.g. when writing
+ tapes > 2Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
seek pointer and prevent it from overflowing. */
if (output_is_special
&& (output_bytes_before_lseek += output_size) < 0L)
@@ -262,8 +262,8 @@ fill_input_buffer (in_des, num_bytes)
{
#ifdef BROKEN_LONG_TAPE_DRIVER
/* Some tape drivers seem to have a signed internal seek pointer and
- they lose if it overflows and becomes negative (e.g. when writing
- tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
+ they lose if it overflows and becomes negative (e.g. when writing
+ tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
seek pointer and prevent it from overflowing. */
if (input_is_special
&& (input_bytes_before_lseek += num_bytes) < 0L)
@@ -369,8 +369,8 @@ peek_in_buf (peek_buf, in_des, num_bytes)
#ifdef BROKEN_LONG_TAPE_DRIVER
/* Some tape drivers seem to have a signed internal seek pointer and
- they lose if it overflows and becomes negative (e.g. when writing
- tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
+ they lose if it overflows and becomes negative (e.g. when writing
+ tapes > 4Gb). Doing an lseek (des, 0, SEEK_SET) seems to reset the
seek pointer and prevent it from overflowing. */
if (input_is_special
&& (input_bytes_before_lseek += num_bytes) < 0L)
@@ -487,9 +487,9 @@ create_all_directories (name)
dir [strlen (dir) - 1] = '\0'; /* remove final + */
mode = 04700;
}
-
+
#endif
-
+
if (dir == NULL)
error (2, 0, "virtual memory exhausted");
@@ -1002,7 +1002,7 @@ add_cdf_double_slashes (input_name)
if (*p == '\0')
return input_name;
- /* There was a `/' preceeded by a `+' in the pathname. If it is a CDF
+ /* There was a `/' preceeded by a `+' in the pathname. If it is a CDF
then we will need to copy the input pathname to our return
buffer so we can insert the extra `/'s. Since we can't tell
yet whether or not it is a CDF we will just always copy the
@@ -1020,7 +1020,7 @@ add_cdf_double_slashes (input_name)
ret_size = n;
}
- /* Clear the `/' after this component, so we can stat the pathname
+ /* Clear the `/' after this component, so we can stat the pathname
up to and including this component. */
++p;
*p = '\0';
OpenPOWER on IntegriCloud