Changeset 2732
- Timestamp:
- 07/11/08 17:20:35 (4 months ago)
- Files:
-
- trunk/lib/vserver.h (modified) (1 diff)
- trunk/src/fstool.c (modified) (2 diffs)
- trunk/src/fstool.h (modified) (2 diffs)
- trunk/src/setattr.c (modified) (2 diffs)
- trunk/src/showattr.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/lib/vserver.h
r2716 r2732 152 152 #define VC_IATTR_WATCH 0x00000002u 153 153 #define VC_IATTR_HIDE 0x00000004u 154 #define VC_IATTR_FLAGS 0x00000007u 154 #define VC_IATTR_WRITE 0x00000008u 155 #define VC_IATTR_FLAGS 0x0000000fu 155 156 156 157 #define VC_IATTR_BARRIER 0x00010000u trunk/src/fstool.c
r2473 r2732 204 204 case CMD_HIDE : args.set_mask |= VC_IATTR_HIDE; break; 205 205 case CMD_BARRIER : args.set_mask |= VC_IATTR_BARRIER; break; 206 case CMD_WRITE : args.set_mask |= VC_IATTR_WRITE; break; 206 207 case CMD_UNSET_IMMU : args.del_mask |= VC_IATTR_IMMUTABLE; /*@fallthrough@*/ 207 208 case CMD_UNSET_IMMUX : args.del_mask |= VC_IATTR_IUNLINK; break; … … 211 212 case CMD_UNSET_HIDE : args.del_mask |= VC_IATTR_HIDE; break; 212 213 case CMD_UNSET_BARRIER : args.del_mask |= VC_IATTR_BARRIER; break; 214 case CMD_UNSET_WRITE : args.del_mask |= VC_IATTR_WRITE; break; 213 215 case 'R' : args.do_recurse = true; break; 214 216 case 'a' : args.do_display_dot = true; break; trunk/src/fstool.h
r2473 r2732 34 34 #define CMD_BARRIER 0x8014 35 35 #define CMD_IMMUX 0x8015 36 #define CMD_WRITE 0x8016 36 37 #define CMD_UNSET_IMMU 0x8020 37 38 #define CMD_UNSET_ADMIN 0x8021 … … 41 42 #define CMD_UNSET_IMMUX 0x8025 42 43 #define CMD_UNSET_IMMUTABLE 0x8026 44 #define CMD_UNSET_WRITE 0x8027 43 45 44 46 trunk/src/setattr.c
r2592 r2732 62 62 { "~immutable", no_argument, 0, CMD_UNSET_IMMUTABLE }, 63 63 { "!immutable", no_argument, 0, CMD_UNSET_IMMUTABLE }, 64 { "write", no_argument, 0, CMD_WRITE }, 65 { "~write", no_argument, 0, CMD_UNSET_WRITE }, 66 { "!write", no_argument, 0, CMD_UNSET_WRITE }, 64 67 { 0,0,0,0 } 65 68 }; … … 73 76 WRITE_STR(fd, cmd); 74 77 WRITE_MSG(fd, 75 " [-Rx] [--[~](iunlink|admin|watch|hide|barrier|iunlink-but-not-immutable|immutable )]* [--] <file>+\n\n"78 " [-Rx] [--[~](iunlink|admin|watch|hide|barrier|iunlink-but-not-immutable|immutable|write)]* [--] <file>+\n\n" 76 79 " Options:\n" 77 80 " -R ... recurse through directories\n" trunk/src/showattr.c
r1980 r2732 108 108 // 1 1 0 0 109 109 // fedcba9876543210fedcba9876543210 110 static char const MARKER[33] = ".......x.....iub............ .hwa";110 static char const MARKER[33] = ".......x.....iub............mhwa"; 111 111 int i; 112 112 uint32_t used_flags = (VC_IATTR_XID|VC_IATTR_ADMIN| 113 113 VC_IATTR_WATCH|VC_IATTR_HIDE| 114 114 VC_IATTR_BARRIER|VC_IATTR_IUNLINK| 115 VC_IATTR_IMMUTABLE );115 VC_IATTR_IMMUTABLE|VC_IATTR_WRITE); 116 116 117 117 for (i=0; i<32; ++i) { … … 128 128 } 129 129 else { 130 memcpy(buf, "ERR ", 7);130 memcpy(buf, "ERR ", 8); 131 131 res = false; 132 132 } 133 133 134 Vwrite(1, buf, 8);134 Vwrite(1, buf, 9); 135 135 Vwrite(1, display_name, strlen(display_name)); 136 136 Vwrite(1, "\n", 1);
