Merge remote-tracking branch 'toybox/master' into HEAD

Change-Id: If441e90859203ae41caf6c2206fcb984e126f31f

9 files changed, 24 insertions, 18 deletions

diff --git a/android/device/generated/flags.h b/android/device/generated/flags.h
index df64f1c4..27109e6d 100644
--- a/android/device/generated/flags.h
+++ b/android/device/generated/flags.h
@@ -1644,9 +1644,9 @@
 #undef FLAG_color
 #endif
 
-// lsattr vldaR vldaR
+// lsattr vpldaR vpldaR
 #undef OPTSTR_lsattr
-#define OPTSTR_lsattr "vldaR"
+#define OPTSTR_lsattr "vpldaR"
 #ifdef CLEANUP_lsattr
 #undef CLEANUP_lsattr
 #undef FOR_lsattr
@@ -1654,6 +1654,7 @@
 #undef FLAG_a
 #undef FLAG_d
 #undef FLAG_l
+#undef FLAG_p
 #undef FLAG_v
 #endif
 
@@ -4805,7 +4806,8 @@
 #define FLAG_a (1<<1)
 #define FLAG_d (1<<2)
 #define FLAG_l (1<<3)
-#define FLAG_v (1<<4)
+#define FLAG_p (1<<4)
+#define FLAG_v (1<<5)
 #endif
 
 #ifdef FOR_lsmod
diff --git a/android/device/generated/help.h b/android/device/generated/help.h
index a53e10c9..245f6982 100644
--- a/android/device/generated/help.h
+++ b/android/device/generated/help.h
@@ -234,9 +234,9 @@
 
 #define HELP_lsmod "usage: lsmod\n\nDisplay the currently loaded modules, their sizes and their dependencies."
 
-#define HELP_chattr "usage: chattr [-R] [-+=AacDdijsStTu] [-v version] [file...]\n\nChange file attributes on a Linux second extended file system.\n\n-R	Recurse\n-v	Set the file's version/generation number\n\nOperators:\n  '-' Remove attributes\n  '+' Add attributes\n  '=' Set attributes\n\nAttributes:\n  A  Don't track atime\n  a  Append mode only\n  C  No copy on write\n  c  Enable compress\n  D  Write dir contents synchronously\n  d  Don't backup with dump\n  F  Case-insensitive directory lookups (casefold)\n  i  Cannot be modified (immutable)\n  j  Write all data to journal first\n  P  Project hierarchy\n  S  Write file contents synchronously\n  s  Zero disk storage when deleted\n  T  Top of directory hierarchy\n  t  Disable tail-merging of partial blocks with other files\n  u  Allow file to be undeleted"
+#define HELP_chattr "usage: chattr [-R] [-+=AacDdijsStTu] [-p projid] [-v version] [file...]\n\nChange file attributes on a Linux second extended file system.\n\n-R	Recurse\n-p	Set the file's project number\n-v	Set the file's version/generation number\n\nOperators:\n  '-' Remove attributes\n  '+' Add attributes\n  '=' Set attributes\n\nAttributes:\n  A  Don't track atime\n  a  Append mode only\n  C  No copy on write\n  c  Enable compress\n  D  Write dir contents synchronously\n  d  Don't backup with dump\n  F  Case-insensitive directory lookups (casefold)\n  i  Cannot be modified (immutable)\n  j  Write all data to journal first\n  P  Project hierarchy\n  S  Write file contents synchronously\n  s  Zero disk storage when deleted\n  T  Top of directory hierarchy\n  t  Disable tail-merging of partial blocks with other files\n  u  Allow file to be undeleted"
 
-#define HELP_lsattr "usage: lsattr [-Radlv] [file...]\n\nList file attributes on a Linux second extended file system.\nFlag letters are defined in chattr help.\n\n-R	Recursively list attributes of directories and their contents\n-a	List all files in directories, including files that start with '.'\n-d	List directories like other files, rather than listing their contents\n-l	List long flag names\n-v	List the file's version/generation number"
+#define HELP_lsattr "usage: lsattr [-Radlpv] [file...]\n\nList file attributes on a Linux second extended file system.\nFlag letters are defined in chattr help.\n\n-R	Recursively list attributes of directories and their contents\n-a	List all files in directories, including files that start with '.'\n-d	List directories like other files, rather than listing their contents\n-l	List long flag names\n-p	List the file's project number\n-v	List the file's version/generation number"
 
 #define HELP_losetup "usage: losetup [-cdrs] [-o OFFSET] [-S SIZE] {-d DEVICE...|-j FILE|-af|{DEVICE FILE}}\n\nAssociate a loopback device with a file, or show current file (if any)\nassociated with a loop device.\n\nInstead of a device:\n-a	Iterate through all loopback devices\n-f	Find first unused loop device (may create one)\n-j FILE	Iterate through all loopback devices associated with FILE\n\nexisting:\n-c	Check capacity (file size changed)\n-d DEV	Detach loopback device\n-D	Detach all loopback devices\n\nnew:\n-s	Show device name (alias --show)\n-o OFF	Start association at offset OFF into FILE\n-r	Read only\n-S SIZE	Limit SIZE of loopback association (alias --sizelimit)"
 
diff --git a/android/device/generated/newtoys.h b/android/device/generated/newtoys.h
index 7d8ad220..79561512 100644
--- a/android/device/generated/newtoys.h
+++ b/android/device/generated/newtoys.h
@@ -147,7 +147,7 @@ USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN))
 USE_LOGWRAPPER(NEWTOY(logwrapper, 0, TOYFLAG_NOHELP|TOYFLAG_USR|TOYFLAG_BIN))
 USE_LOSETUP(NEWTOY(losetup, ">2S(sizelimit)#s(show)ro#j:fdcaD[!afj]", TOYFLAG_SBIN))
 USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE))
-USE_LSATTR(NEWTOY(lsattr, "vldaR", TOYFLAG_BIN))
+USE_LSATTR(NEWTOY(lsattr, "vpldaR", TOYFLAG_BIN))
 USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN))
 USE_LSOF(NEWTOY(lsof, "lp*t", TOYFLAG_USR|TOYFLAG_BIN))
 USE_LSPCI(NEWTOY(lspci, "emkn"USE_LSPCI_TEXT("@i:"), TOYFLAG_USR|TOYFLAG_BIN))
diff --git a/android/linux/generated/flags.h b/android/linux/generated/flags.h
index 65c2525a..f397ea6f 100644
--- a/android/linux/generated/flags.h
+++ b/android/linux/generated/flags.h
@@ -1644,9 +1644,9 @@
 #undef FLAG_color
 #endif
 
-// lsattr   vldaR
+// lsattr   vpldaR
 #undef OPTSTR_lsattr
-#define OPTSTR_lsattr "vldaR"
+#define OPTSTR_lsattr "vpldaR"
 #ifdef CLEANUP_lsattr
 #undef CLEANUP_lsattr
 #undef FOR_lsattr
@@ -1654,6 +1654,7 @@
 #undef FLAG_a
 #undef FLAG_d
 #undef FLAG_l
+#undef FLAG_p
 #undef FLAG_v
 #endif
 
@@ -4805,7 +4806,8 @@
 #define FLAG_a (FORCED_FLAG<<1)
 #define FLAG_d (FORCED_FLAG<<2)
 #define FLAG_l (FORCED_FLAG<<3)
-#define FLAG_v (FORCED_FLAG<<4)
+#define FLAG_p (FORCED_FLAG<<4)
+#define FLAG_v (FORCED_FLAG<<5)
 #endif
 
 #ifdef FOR_lsmod
diff --git a/android/linux/generated/help.h b/android/linux/generated/help.h
index f93684a2..0b0e927b 100644
--- a/android/linux/generated/help.h
+++ b/android/linux/generated/help.h
@@ -236,9 +236,9 @@
 
 #define HELP_lsmod "usage: lsmod\n\nDisplay the currently loaded modules, their sizes and their dependencies."
 
-#define HELP_chattr "usage: chattr [-R] [-+=AacDdijsStTu] [-v version] [file...]\n\nChange file attributes on a Linux second extended file system.\n\n-R	Recurse\n-v	Set the file's version/generation number\n\nOperators:\n  '-' Remove attributes\n  '+' Add attributes\n  '=' Set attributes\n\nAttributes:\n  A  Don't track atime\n  a  Append mode only\n  C  No copy on write\n  c  Enable compress\n  D  Write dir contents synchronously\n  d  Don't backup with dump\n  F  Case-insensitive directory lookups (casefold)\n  i  Cannot be modified (immutable)\n  j  Write all data to journal first\n  P  Project hierarchy\n  S  Write file contents synchronously\n  s  Zero disk storage when deleted\n  T  Top of directory hierarchy\n  t  Disable tail-merging of partial blocks with other files\n  u  Allow file to be undeleted"
+#define HELP_chattr "usage: chattr [-R] [-+=AacDdijsStTu] [-p projid] [-v version] [file...]\n\nChange file attributes on a Linux second extended file system.\n\n-R	Recurse\n-p	Set the file's project number\n-v	Set the file's version/generation number\n\nOperators:\n  '-' Remove attributes\n  '+' Add attributes\n  '=' Set attributes\n\nAttributes:\n  A  Don't track atime\n  a  Append mode only\n  C  No copy on write\n  c  Enable compress\n  D  Write dir contents synchronously\n  d  Don't backup with dump\n  F  Case-insensitive directory lookups (casefold)\n  i  Cannot be modified (immutable)\n  j  Write all data to journal first\n  P  Project hierarchy\n  S  Write file contents synchronously\n  s  Zero disk storage when deleted\n  T  Top of directory hierarchy\n  t  Disable tail-merging of partial blocks with other files\n  u  Allow file to be undeleted"
 
-#define HELP_lsattr "usage: lsattr [-Radlv] [file...]\n\nList file attributes on a Linux second extended file system.\nFlag letters are defined in chattr help.\n\n-R	Recursively list attributes of directories and their contents\n-a	List all files in directories, including files that start with '.'\n-d	List directories like other files, rather than listing their contents\n-l	List long flag names\n-v	List the file's version/generation number"
+#define HELP_lsattr "usage: lsattr [-Radlpv] [file...]\n\nList file attributes on a Linux second extended file system.\nFlag letters are defined in chattr help.\n\n-R	Recursively list attributes of directories and their contents\n-a	List all files in directories, including files that start with '.'\n-d	List directories like other files, rather than listing their contents\n-l	List long flag names\n-p	List the file's project number\n-v	List the file's version/generation number"
 
 #define HELP_losetup "usage: losetup [-cdrs] [-o OFFSET] [-S SIZE] {-d DEVICE...|-j FILE|-af|{DEVICE FILE}}\n\nAssociate a loopback device with a file, or show current file (if any)\nassociated with a loop device.\n\nInstead of a device:\n-a	Iterate through all loopback devices\n-f	Find first unused loop device (may create one)\n-j FILE	Iterate through all loopback devices associated with FILE\n\nexisting:\n-c	Check capacity (file size changed)\n-d DEV	Detach loopback device\n-D	Detach all loopback devices\n\nnew:\n-s	Show device name (alias --show)\n-o OFF	Start association at offset OFF into FILE\n-r	Read only\n-S SIZE	Limit SIZE of loopback association (alias --sizelimit)"
 
diff --git a/android/linux/generated/newtoys.h b/android/linux/generated/newtoys.h
index 7d8ad220..79561512 100644
--- a/android/linux/generated/newtoys.h
+++ b/android/linux/generated/newtoys.h
@@ -147,7 +147,7 @@ USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN))
 USE_LOGWRAPPER(NEWTOY(logwrapper, 0, TOYFLAG_NOHELP|TOYFLAG_USR|TOYFLAG_BIN))
 USE_LOSETUP(NEWTOY(losetup, ">2S(sizelimit)#s(show)ro#j:fdcaD[!afj]", TOYFLAG_SBIN))
 USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE))
-USE_LSATTR(NEWTOY(lsattr, "vldaR", TOYFLAG_BIN))
+USE_LSATTR(NEWTOY(lsattr, "vpldaR", TOYFLAG_BIN))
 USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN))
 USE_LSOF(NEWTOY(lsof, "lp*t", TOYFLAG_USR|TOYFLAG_BIN))
 USE_LSPCI(NEWTOY(lspci, "emkn"USE_LSPCI_TEXT("@i:"), TOYFLAG_USR|TOYFLAG_BIN))
diff --git a/android/mac/generated/flags.h b/android/mac/generated/flags.h
index efef9bd3..765d2223 100644
--- a/android/mac/generated/flags.h
+++ b/android/mac/generated/flags.h
@@ -1644,9 +1644,9 @@
 #undef FLAG_color
 #endif
 
-// lsattr   vldaR
+// lsattr   vpldaR
 #undef OPTSTR_lsattr
-#define OPTSTR_lsattr "vldaR"
+#define OPTSTR_lsattr "vpldaR"
 #ifdef CLEANUP_lsattr
 #undef CLEANUP_lsattr
 #undef FOR_lsattr
@@ -1654,6 +1654,7 @@
 #undef FLAG_a
 #undef FLAG_d
 #undef FLAG_l
+#undef FLAG_p
 #undef FLAG_v
 #endif
 
@@ -4805,7 +4806,8 @@
 #define FLAG_a (FORCED_FLAG<<1)
 #define FLAG_d (FORCED_FLAG<<2)
 #define FLAG_l (FORCED_FLAG<<3)
-#define FLAG_v (FORCED_FLAG<<4)
+#define FLAG_p (FORCED_FLAG<<4)
+#define FLAG_v (FORCED_FLAG<<5)
 #endif
 
 #ifdef FOR_lsmod
diff --git a/android/mac/generated/help.h b/android/mac/generated/help.h
index f93684a2..0b0e927b 100644
--- a/android/mac/generated/help.h
+++ b/android/mac/generated/help.h
@@ -236,9 +236,9 @@
 
 #define HELP_lsmod "usage: lsmod\n\nDisplay the currently loaded modules, their sizes and their dependencies."
 
-#define HELP_chattr "usage: chattr [-R] [-+=AacDdijsStTu] [-v version] [file...]\n\nChange file attributes on a Linux second extended file system.\n\n-R	Recurse\n-v	Set the file's version/generation number\n\nOperators:\n  '-' Remove attributes\n  '+' Add attributes\n  '=' Set attributes\n\nAttributes:\n  A  Don't track atime\n  a  Append mode only\n  C  No copy on write\n  c  Enable compress\n  D  Write dir contents synchronously\n  d  Don't backup with dump\n  F  Case-insensitive directory lookups (casefold)\n  i  Cannot be modified (immutable)\n  j  Write all data to journal first\n  P  Project hierarchy\n  S  Write file contents synchronously\n  s  Zero disk storage when deleted\n  T  Top of directory hierarchy\n  t  Disable tail-merging of partial blocks with other files\n  u  Allow file to be undeleted"
+#define HELP_chattr "usage: chattr [-R] [-+=AacDdijsStTu] [-p projid] [-v version] [file...]\n\nChange file attributes on a Linux second extended file system.\n\n-R	Recurse\n-p	Set the file's project number\n-v	Set the file's version/generation number\n\nOperators:\n  '-' Remove attributes\n  '+' Add attributes\n  '=' Set attributes\n\nAttributes:\n  A  Don't track atime\n  a  Append mode only\n  C  No copy on write\n  c  Enable compress\n  D  Write dir contents synchronously\n  d  Don't backup with dump\n  F  Case-insensitive directory lookups (casefold)\n  i  Cannot be modified (immutable)\n  j  Write all data to journal first\n  P  Project hierarchy\n  S  Write file contents synchronously\n  s  Zero disk storage when deleted\n  T  Top of directory hierarchy\n  t  Disable tail-merging of partial blocks with other files\n  u  Allow file to be undeleted"
 
-#define HELP_lsattr "usage: lsattr [-Radlv] [file...]\n\nList file attributes on a Linux second extended file system.\nFlag letters are defined in chattr help.\n\n-R	Recursively list attributes of directories and their contents\n-a	List all files in directories, including files that start with '.'\n-d	List directories like other files, rather than listing their contents\n-l	List long flag names\n-v	List the file's version/generation number"
+#define HELP_lsattr "usage: lsattr [-Radlpv] [file...]\n\nList file attributes on a Linux second extended file system.\nFlag letters are defined in chattr help.\n\n-R	Recursively list attributes of directories and their contents\n-a	List all files in directories, including files that start with '.'\n-d	List directories like other files, rather than listing their contents\n-l	List long flag names\n-p	List the file's project number\n-v	List the file's version/generation number"
 
 #define HELP_losetup "usage: losetup [-cdrs] [-o OFFSET] [-S SIZE] {-d DEVICE...|-j FILE|-af|{DEVICE FILE}}\n\nAssociate a loopback device with a file, or show current file (if any)\nassociated with a loop device.\n\nInstead of a device:\n-a	Iterate through all loopback devices\n-f	Find first unused loop device (may create one)\n-j FILE	Iterate through all loopback devices associated with FILE\n\nexisting:\n-c	Check capacity (file size changed)\n-d DEV	Detach loopback device\n-D	Detach all loopback devices\n\nnew:\n-s	Show device name (alias --show)\n-o OFF	Start association at offset OFF into FILE\n-r	Read only\n-S SIZE	Limit SIZE of loopback association (alias --sizelimit)"
 
diff --git a/android/mac/generated/newtoys.h b/android/mac/generated/newtoys.h
index 7d8ad220..79561512 100644
--- a/android/mac/generated/newtoys.h
+++ b/android/mac/generated/newtoys.h
@@ -147,7 +147,7 @@ USE_LOGNAME(NEWTOY(logname, ">0", TOYFLAG_USR|TOYFLAG_BIN))
 USE_LOGWRAPPER(NEWTOY(logwrapper, 0, TOYFLAG_NOHELP|TOYFLAG_USR|TOYFLAG_BIN))
 USE_LOSETUP(NEWTOY(losetup, ">2S(sizelimit)#s(show)ro#j:fdcaD[!afj]", TOYFLAG_SBIN))
 USE_LS(NEWTOY(ls, "(color):;(full-time)(show-control-chars)ZgoACFHLRSabcdfhikl@mnpqrstuw#=80<0x1[-Cxm1][-Cxml][-Cxmo][-Cxmg][-cu][-ftS][-HL][!qb]", TOYFLAG_BIN|TOYFLAG_LOCALE))
-USE_LSATTR(NEWTOY(lsattr, "vldaR", TOYFLAG_BIN))
+USE_LSATTR(NEWTOY(lsattr, "vpldaR", TOYFLAG_BIN))
 USE_LSMOD(NEWTOY(lsmod, NULL, TOYFLAG_SBIN))
 USE_LSOF(NEWTOY(lsof, "lp*t", TOYFLAG_USR|TOYFLAG_BIN))
 USE_LSPCI(NEWTOY(lspci, "emkn"USE_LSPCI_TEXT("@i:"), TOYFLAG_USR|TOYFLAG_BIN))