| 1 |
commit: 31ef9b6bee999988f364d64be3810fed6ae55903 |
| 2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Nov 3 12:32:54 2011 +0000 |
| 4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Nov 3 19:02:06 2011 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/elfix.git;a=commit;h=31ef9b6b |
| 7 |
|
| 8 |
src/paxctl-ng.c: #defined values for cp_flags |
| 9 |
|
| 10 |
--- |
| 11 |
src/paxctl-ng.c | 27 +++++++++++++++++---------- |
| 12 |
1 files changed, 17 insertions(+), 10 deletions(-) |
| 13 |
|
| 14 |
diff --git a/src/paxctl-ng.c b/src/paxctl-ng.c |
| 15 |
index d3ddb2f..94dea09 100644 |
| 16 |
--- a/src/paxctl-ng.c |
| 17 |
+++ b/src/paxctl-ng.c |
| 18 |
@@ -37,6 +37,11 @@ |
| 19 |
#define PAX_NAMESPACE "user.pax" |
| 20 |
#define BUF_SIZE 7 |
| 21 |
|
| 22 |
+#define CREATE_XT_FLAGS_SECURE 1 |
| 23 |
+#define CREATE_XT_FLAGS_DEFAULT 2 |
| 24 |
+#define COPY_PT_TO_XT_FLAGS 3 |
| 25 |
+#define COPY_XT_TO_PT_FLAGS 4 |
| 26 |
+ |
| 27 |
void |
| 28 |
print_help(char *v) |
| 29 |
{ |
| 30 |
@@ -85,6 +90,7 @@ parse_cmd_args(int c, char *v[], uint16_t *pax_flags, int *view_flags, int *cp_f |
| 31 |
*view_flags = 0; |
| 32 |
*cp_flags = 0; |
| 33 |
while((oc = getopt(c, v,":PpEeMmRrXxSsZzCcFfvh")) != -1) |
| 34 |
+ { |
| 35 |
switch(oc) |
| 36 |
{ |
| 37 |
case 'P': |
| 38 |
@@ -148,19 +154,19 @@ parse_cmd_args(int c, char *v[], uint16_t *pax_flags, int *view_flags, int *cp_f |
| 39 |
break; |
| 40 |
case 'C': |
| 41 |
solitaire += 1; |
| 42 |
- *cp_flags = 1; |
| 43 |
+ *cp_flags = CREATE_XT_FLAGS_SECURE; |
| 44 |
break; |
| 45 |
case 'c': |
| 46 |
solitaire += 1; |
| 47 |
- *cp_flags = 2; |
| 48 |
+ *cp_flags = CREATE_XT_FLAGS_DEFAULT; |
| 49 |
break; |
| 50 |
case 'F': |
| 51 |
solitaire += 1; |
| 52 |
- *cp_flags = 3; |
| 53 |
+ *cp_flags = COPY_PT_TO_XT_FLAGS; |
| 54 |
break; |
| 55 |
case 'f': |
| 56 |
solitaire += 1; |
| 57 |
- *cp_flags = 4; |
| 58 |
+ *cp_flags = COPY_XT_TO_PT_FLAGS; |
| 59 |
break; |
| 60 |
case 'v': |
| 61 |
*view_flags = 1; |
| 62 |
@@ -172,6 +178,7 @@ parse_cmd_args(int c, char *v[], uint16_t *pax_flags, int *view_flags, int *cp_f |
| 63 |
default: |
| 64 |
error(EXIT_FAILURE, 0, "option -%c is invalid: ignored.", optopt ) ; |
| 65 |
} |
| 66 |
+ } |
| 67 |
|
| 68 |
if |
| 69 |
( |
| 70 |
@@ -509,11 +516,11 @@ main( int argc, char *argv[]) |
| 71 |
{ |
| 72 |
const char *f_name; |
| 73 |
int fd; |
| 74 |
- uint16_t flags; |
| 75 |
+ uint16_t pax_flags; |
| 76 |
int view_flags, cp_flags; |
| 77 |
int rdwr_pt_pax = 1; |
| 78 |
|
| 79 |
- f_name = parse_cmd_args(argc, argv, &flags, &view_flags, &cp_flags); |
| 80 |
+ f_name = parse_cmd_args(argc, argv, &pax_flags, &view_flags, &cp_flags); |
| 81 |
|
| 82 |
if((fd = open(f_name, O_RDWR)) < 0) |
| 83 |
{ |
| 84 |
@@ -523,14 +530,14 @@ main( int argc, char *argv[]) |
| 85 |
error(EXIT_FAILURE, 0, "open() failed"); |
| 86 |
} |
| 87 |
|
| 88 |
- if(cp_flags == 1 || cp_flags == 2) |
| 89 |
+ if(cp_flags == CREATE_XT_FLAGS_SECURE || cp_flags == CREATE_XT_FLAGS_DEFAULT) |
| 90 |
create_xt_flags(fd, cp_flags); |
| 91 |
|
| 92 |
- if(cp_flags == 3 || (cp_flags == 4 && rdwr_pt_pax)) |
| 93 |
+ if(cp_flags == COPY_PT_TO_XT_FLAGS || (cp_flags == COPY_XT_TO_PT_FLAGS && rdwr_pt_pax)) |
| 94 |
copy_xt_flags(fd, cp_flags); |
| 95 |
|
| 96 |
- if(flags != 1) |
| 97 |
- set_flags(fd, &flags, rdwr_pt_pax); |
| 98 |
+ if(pax_flags != 1) |
| 99 |
+ set_flags(fd, &pax_flags, rdwr_pt_pax); |
| 100 |
|
| 101 |
if(view_flags == 1) |
| 102 |
print_flags(fd); |
Archives