aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2006-01-05 03:12:07 +0000
committerMike Frysinger <vapier@gentoo.org>2006-01-05 03:12:07 +0000
commit2e3a443d5fac6c0c0790f95c4dc5137f310986eb (patch)
treeaceae6abd6614263aa89f9087a7eb8e26f59c91b
parentopenbsd sucks as well (diff)
downloadpax-utils-2e3a443d5fac6c0c0790f95c4dc5137f310986eb.tar.gz
pax-utils-2e3a443d5fac6c0c0790f95c4dc5137f310986eb.tar.bz2
pax-utils-2e3a443d5fac6c0c0790f95c4dc5137f310986eb.zip
update copyright years and unify headers in porting.h
-rw-r--r--dumpelf.c22
-rw-r--r--paxelf.c14
-rw-r--r--paxelf.h8
-rw-r--r--paxinc.c16
-rw-r--r--paxinc.h8
-rw-r--r--paxmacho.c14
-rw-r--r--paxmacho.h8
-rw-r--r--porting.h24
-rw-r--r--pspax.c21
-rw-r--r--scanelf.c24
10 files changed, 57 insertions, 102 deletions
diff --git a/dumpelf.c b/dumpelf.c
index 4f932b4..b61d581 100644
--- a/dumpelf.c
+++ b/dumpelf.c
@@ -1,27 +1,15 @@
/*
- * Copyright 2005 Gentoo Foundation
+ * Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/dumpelf.c,v 1.15 2005/12/09 01:42:19 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/dumpelf.c,v 1.16 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <dirent.h>
-#include <getopt.h>
-#include <assert.h>
-#include <ctype.h>
-
#include "paxinc.h"
-static const char *rcsid = "$Id: dumpelf.c,v 1.15 2005/12/09 01:42:19 vapier Exp $";
+static const char *rcsid = "$Id: dumpelf.c,v 1.16 2006/01/05 03:12:07 vapier Exp $";
#define argv0 "dumpelf"
/* prototypes */
diff --git a/paxelf.c b/paxelf.c
index b40eccf..e259ff7 100644
--- a/paxelf.c
+++ b/paxelf.c
@@ -1,18 +1,12 @@
/*
- * Copyright 2003-2005 Gentoo Foundation
+ * Copyright 2003-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.30 2005/12/07 01:04:05 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.c,v 1.31 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*/
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
#include "paxinc.h"
#define argv0 "paxelf"
diff --git a/paxelf.h b/paxelf.h
index 04577b0..a2b86f2 100644
--- a/paxelf.h
+++ b/paxelf.h
@@ -1,10 +1,10 @@
/*
- * Copyright 2005 Gentoo Foundation
+ * Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.h,v 1.36 2005/10/13 01:53:55 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxelf.h,v 1.37 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*
* Make sure all of the common elf stuff is setup as we expect
*/
diff --git a/paxinc.c b/paxinc.c
index 069814a..86ce56a 100644
--- a/paxinc.c
+++ b/paxinc.c
@@ -1,18 +1,14 @@
/*
- * Copyright 2003-2005 Gentoo Foundation
+ * Copyright 2003-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxinc.c,v 1.1 2005/10/13 01:53:55 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxinc.c,v 1.2 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*/
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
+/* stick common symbols here that are needed by paxinc.h */
+
#include "paxinc.h"
#define argv0 "paxinc"
diff --git a/paxinc.h b/paxinc.h
index 1f450fa..3ea7984 100644
--- a/paxinc.h
+++ b/paxinc.h
@@ -1,10 +1,10 @@
/*
- * Copyright 2005 Gentoo Foundation
+ * Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxinc.h,v 1.2 2005/11/02 04:23:21 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxinc.h,v 1.3 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*
* Make sure all of the common stuff is setup as we expect
*/
diff --git a/paxmacho.c b/paxmacho.c
index 59099a0..24b2165 100644
--- a/paxmacho.c
+++ b/paxmacho.c
@@ -1,18 +1,12 @@
/*
- * Copyright 2003-2005 Gentoo Foundation
+ * Copyright 2003-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.c,v 1.1 2005/11/02 04:23:21 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.c,v 1.2 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*/
-#include <stdio.h>
-#include <fcntl.h>
-#include <sys/stat.h>
-#include <stdlib.h>
-#include <unistd.h>
-#include <string.h>
#include "paxinc.h"
#define argv0 "paxmacho"
diff --git a/paxmacho.h b/paxmacho.h
index e644ff4..d45de16 100644
--- a/paxmacho.h
+++ b/paxmacho.h
@@ -1,10 +1,10 @@
/*
- * Copyright 2005 Gentoo Foundation
+ * Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.h,v 1.1 2005/11/02 04:23:21 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/paxmacho.h,v 1.2 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*
* Make sure all of the common mach-o stuff is setup as we expect
*/
diff --git a/porting.h b/porting.h
index 028ca61..88e075d 100644
--- a/porting.h
+++ b/porting.h
@@ -1,10 +1,10 @@
/*
- * Copyright 2005 Gentoo Foundation
+ * Copyright 2005-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/porting.h,v 1.8 2005/12/30 22:39:40 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/porting.h,v 1.9 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2005-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2005-2006 Mike Frysinger - <vapier@gentoo.org>
*
* Make sure all of the common elf stuff is setup as we expect
*/
@@ -12,6 +12,22 @@
#ifndef _PORTING_H
#define _PORTING_H
+#include <stdio.h>
+#include <stdlib.h>
+#include <errno.h>
+#include <string.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <dirent.h>
+#include <limits.h>
+#include <fcntl.h>
+#include <assert.h>
+#include <getopt.h>
+#include <libgen.h>
+#include <ctype.h>
+#include <pwd.h>
+
#include <sys/mman.h>
#include "elf.h"
#if defined(__linux__)
diff --git a/pspax.c b/pspax.c
index 7475ab7..c90685c 100644
--- a/pspax.c
+++ b/pspax.c
@@ -13,25 +13,6 @@
*
*/
-#include <sys/types.h>
-#include <errno.h>
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <libgen.h>
-#include <unistd.h>
-#include <dirent.h>
-#include <ctype.h>
-#include <errno.h>
-#include <sys/stat.h>
-#include <pwd.h>
-
-#include <sys/types.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <getopt.h>
-
#include "paxinc.h"
#ifdef WANT_SYSCAP
@@ -40,7 +21,7 @@
#endif
#define PROC_DIR "/proc"
-static const char *rcsid = "$Id: pspax.c,v 1.23 2005/10/13 01:53:55 vapier Exp $";
+static const char *rcsid = "$Id: pspax.c,v 1.24 2006/01/05 03:12:07 vapier Exp $";
#define argv0 "pspax"
diff --git a/scanelf.c b/scanelf.c
index 6a4784a..28e4daa 100644
--- a/scanelf.c
+++ b/scanelf.c
@@ -1,29 +1,15 @@
/*
- * Copyright 2003-2005 Gentoo Foundation
+ * Copyright 2003-2006 Gentoo Foundation
* Distributed under the terms of the GNU General Public License v2
- * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.97 2005/12/29 14:03:25 vapier Exp $
+ * $Header: /var/cvsroot/gentoo-projects/pax-utils/scanelf.c,v 1.98 2006/01/05 03:12:07 vapier Exp $
*
- * Copyright 2003-2005 Ned Ludd - <solar@gentoo.org>
- * Copyright 2004-2005 Mike Frysinger - <vapier@gentoo.org>
+ * Copyright 2003-2006 Ned Ludd - <solar@gentoo.org>
+ * Copyright 2004-2006 Mike Frysinger - <vapier@gentoo.org>
*/
-#include <stdio.h>
-#include <stdlib.h>
-#include <sys/types.h>
-#include <libgen.h>
-#include <limits.h>
-#include <string.h>
-#include <errno.h>
-#include <unistd.h>
-#include <sys/stat.h>
-#include <sys/mman.h>
-#include <fcntl.h>
-#include <dirent.h>
-#include <getopt.h>
-#include <assert.h>
#include "paxinc.h"
-static const char *rcsid = "$Id: scanelf.c,v 1.97 2005/12/29 14:03:25 vapier Exp $";
+static const char *rcsid = "$Id: scanelf.c,v 1.98 2006/01/05 03:12:07 vapier Exp $";
#define argv0 "scanelf"
#define IS_MODIFIER(c) (c == '%' || c == '#')