summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2010-07-23 08:00:44 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2010-07-23 08:00:44 (GMT)
commitc745039dcdc24e019205aa8d76f5231049c67b2b (patch) (side-by-side diff)
tree2ca78587af7f13a32a6732b12fb39a6592de4883
parent6377e0dfecb9836aabca5d11f2dcfa7d722115af (diff)
downloadcpio-c745039dcdc24e019205aa8d76f5231049c67b2b.tar.gz
cpio-c745039dcdc24e019205aa8d76f5231049c67b2b.tar.bz2
Housekeeping.
* .gitignore: Sort. * src/cpiohdr.h: Fix indentation of preprocessor statements. * src/filetypes.h: Likewise.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--.gitignore4
-rw-r--r--src/cpiohdr.h46
-rw-r--r--src/filetypes.h38
3 files changed, 44 insertions, 44 deletions
diff --git a/.gitignore b/.gitignore
index 5ae1208..ea5bcba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,9 @@
*.a
*.o
-*.tar.*
+*.patch
*.shar.*
+*.tar.*
*~
-*.patch
.bootstrap
.deps
.emacs.desktop*
diff --git a/src/cpiohdr.h b/src/cpiohdr.h
index bb1ad6b..86ec988 100644
--- a/src/cpiohdr.h
+++ b/src/cpiohdr.h
@@ -18,21 +18,21 @@
#ifndef _CPIOHDR_H
-#define _CPIOHDR_H 1
+# define _CPIOHDR_H 1
-#include <cpio.h>
+# include <cpio.h>
-#ifdef HAVE_ATTRIB_PACKED
-#define ATTRIB_PACKED __attribute__((packed))
-#endif
+# ifdef HAVE_ATTRIB_PACKED
+# define ATTRIB_PACKED __attribute__((packed))
+# endif
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
+# ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+# endif
-#ifdef HAVE_PRAGMA_PACK_HPPA
-#pragma pack 1
-#endif
+# ifdef HAVE_PRAGMA_PACK_HPPA
+# pragma pack 1
+# endif
struct old_cpio_header
{
@@ -49,13 +49,13 @@ struct old_cpio_header
unsigned short c_filesizes[2];
} ATTRIB_PACKED;
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
+# ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+# endif
-#ifdef HAVE_PRAGMA_PACK_HPPA
-#pragma pack 1
-#endif
+# ifdef HAVE_PRAGMA_PACK_HPPA
+# pragma pack 1
+# endif
struct old_ascii_header
{
char c_magic[6];
@@ -81,13 +81,13 @@ struct old_ascii_header
/* All the fields in the header are ISO 646 (approximately ASCII) strings
of hexadecimal numbers, left padded, not NUL terminated: */
-#ifdef HAVE_PRAGMA_PACK
-#pragma pack(1)
-#endif
+# ifdef HAVE_PRAGMA_PACK
+# pragma pack(1)
+# endif
-#ifdef HAVE_PRAGMA_PACK_HPPA
-#pragma pack 1
-#endif
+# ifdef HAVE_PRAGMA_PACK_HPPA
+# pragma pack 1
+# endif
struct new_ascii_header
{
char c_magic[6]; /* "070701" for "new" portable format
diff --git a/src/filetypes.h b/src/filetypes.h
index 81f0c32..252a1db 100644
--- a/src/filetypes.h
+++ b/src/filetypes.h
@@ -19,65 +19,65 @@
/* Include sys/types.h and sys/stat.h before this file. */
#ifndef S_ISREG /* Doesn't have POSIX.1 stat stuff. */
-#define mode_t unsigned short
+# define mode_t unsigned short
#endif
/* Define the POSIX macros for systems that lack them. */
#if !defined(S_ISBLK) && defined(S_IFBLK)
-#define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
+# define S_ISBLK(m) (((m) & S_IFMT) == S_IFBLK)
#endif
#if !defined(S_ISCHR) && defined(S_IFCHR)
-#define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
+# define S_ISCHR(m) (((m) & S_IFMT) == S_IFCHR)
#endif
#if !defined(S_ISDIR) && defined(S_IFDIR)
-#define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
+# define S_ISDIR(m) (((m) & S_IFMT) == S_IFDIR)
#endif
#if !defined(S_ISREG) && defined(S_IFREG)
-#define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
+# define S_ISREG(m) (((m) & S_IFMT) == S_IFREG)
#endif
#if !defined(S_ISFIFO) && defined(S_IFIFO)
-#define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
+# define S_ISFIFO(m) (((m) & S_IFMT) == S_IFIFO)
#endif
#if !defined(S_ISLNK) && defined(S_IFLNK)
-#define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
+# define S_ISLNK(m) (((m) & S_IFMT) == S_IFLNK)
#endif
#if !defined(S_ISSOCK) && defined(S_IFSOCK)
-#define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
+# define S_ISSOCK(m) (((m) & S_IFMT) == S_IFSOCK)
#endif
#if !defined(S_ISNWK) && defined(S_IFNWK) /* HP/UX network special */
-#define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
+# define S_ISNWK(m) (((m) & S_IFMT) == S_IFNWK)
#endif
/* Define the file type bits used in cpio archives.
They have the same values as the S_IF bits in traditional Unix. */
-#define CP_IFMT 0170000 /* Mask for all file type bits. */
+#define CP_IFMT 0170000 /* Mask for all file type bits. */
#if defined(S_ISBLK)
-#define CP_IFBLK 0060000
+# define CP_IFBLK 0060000
#endif
#if defined(S_ISCHR)
-#define CP_IFCHR 0020000
+# define CP_IFCHR 0020000
#endif
#if defined(S_ISDIR)
-#define CP_IFDIR 0040000
+# define CP_IFDIR 0040000
#endif
#if defined(S_ISREG)
-#define CP_IFREG 0100000
+# define CP_IFREG 0100000
#endif
#if defined(S_ISFIFO)
-#define CP_IFIFO 0010000
+# define CP_IFIFO 0010000
#endif
#if defined(S_ISLNK)
-#define CP_IFLNK 0120000
+# define CP_IFLNK 0120000
#endif
#if defined(S_ISSOCK)
-#define CP_IFSOCK 0140000
+# define CP_IFSOCK 0140000
#endif
#if defined(S_ISNWK)
-#define CP_IFNWK 0110000
+# define CP_IFNWK 0110000
#endif
#ifndef S_ISLNK
-#define lstat stat
+# define lstat stat
#endif

Return to:

Send suggestions and report system problems to the System administrator.