Merge remote-tracking branch 'toybox/master' into HEAD am: afa9580831

Original change: https://android-review.googlesource.com/c/platform/external/toybox/+/1633265

Change-Id: I6073e6715052e96f1ed2310e1760c030648a5fc3

8 files changed, 14 insertions, 13 deletions

diff --git a/android/device/generated/flags.h b/android/device/generated/flags.h
index 815f8642..c7151866 100644
--- a/android/device/generated/flags.h
+++ b/android/device/generated/flags.h
@@ -601,9 +601,9 @@
 #undef FOR_devmem
 #endif
 
-// df HPkhit*a[-HPkh] HPkhit*a[-HPkh]
+// df HPkhit*a[-HPh] HPkhit*a[-HPh]
 #undef OPTSTR_df
-#define OPTSTR_df "HPkhit*a[-HPkh]"
+#define OPTSTR_df "HPkhit*a[-HPh]"
 #ifdef CLEANUP_df
 #undef CLEANUP_df
 #undef FOR_df
diff --git a/android/device/generated/newtoys.h b/android/device/generated/newtoys.h
index d79b38ec..75a5d5ea 100644
--- a/android/device/generated/newtoys.h
+++ b/android/device/generated/newtoys.h
@@ -57,7 +57,7 @@ USE_DEMO_NUMBER(NEWTOY(demo_number, "D#=3<3M#<0hcdbs", TOYFLAG_BIN))
 USE_DEMO_SCANKEY(NEWTOY(demo_scankey, 0, TOYFLAG_BIN))
 USE_DEMO_UTF8TOWC(NEWTOY(demo_utf8towc, 0, TOYFLAG_USR|TOYFLAG_BIN))
 USE_DEVMEM(NEWTOY(devmem, "<1>3", TOYFLAG_USR|TOYFLAG_BIN))
-USE_DF(NEWTOY(df, "HPkhit*a[-HPkh]", TOYFLAG_SBIN))
+USE_DF(NEWTOY(df, "HPkhit*a[-HPh]", TOYFLAG_SBIN))
 USE_DHCP(NEWTOY(dhcp, "V:H:F:x*r:O*A#<0=20T#<0=3t#<0=3s:p:i:SBRCaovqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
 USE_DHCP6(NEWTOY(dhcp6, "r:A#<0T#<0t#<0s:p:i:SRvqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
 USE_DHCPD(NEWTOY(dhcpd, ">1P#<0>65535fi:S46[!46]", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
diff --git a/android/linux/generated/flags.h b/android/linux/generated/flags.h
index dcf8f484..e9bffbf5 100644
--- a/android/linux/generated/flags.h
+++ b/android/linux/generated/flags.h
@@ -601,9 +601,9 @@
 #undef FOR_devmem
 #endif
 
-// df   HPkhit*a[-HPkh]
+// df   HPkhit*a[-HPh]
 #undef OPTSTR_df
-#define OPTSTR_df "HPkhit*a[-HPkh]"
+#define OPTSTR_df "HPkhit*a[-HPh]"
 #ifdef CLEANUP_df
 #undef CLEANUP_df
 #undef FOR_df
diff --git a/android/linux/generated/newtoys.h b/android/linux/generated/newtoys.h
index d79b38ec..75a5d5ea 100644
--- a/android/linux/generated/newtoys.h
+++ b/android/linux/generated/newtoys.h
@@ -57,7 +57,7 @@ USE_DEMO_NUMBER(NEWTOY(demo_number, "D#=3<3M#<0hcdbs", TOYFLAG_BIN))
 USE_DEMO_SCANKEY(NEWTOY(demo_scankey, 0, TOYFLAG_BIN))
 USE_DEMO_UTF8TOWC(NEWTOY(demo_utf8towc, 0, TOYFLAG_USR|TOYFLAG_BIN))
 USE_DEVMEM(NEWTOY(devmem, "<1>3", TOYFLAG_USR|TOYFLAG_BIN))
-USE_DF(NEWTOY(df, "HPkhit*a[-HPkh]", TOYFLAG_SBIN))
+USE_DF(NEWTOY(df, "HPkhit*a[-HPh]", TOYFLAG_SBIN))
 USE_DHCP(NEWTOY(dhcp, "V:H:F:x*r:O*A#<0=20T#<0=3t#<0=3s:p:i:SBRCaovqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
 USE_DHCP6(NEWTOY(dhcp6, "r:A#<0T#<0t#<0s:p:i:SRvqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
 USE_DHCPD(NEWTOY(dhcpd, ">1P#<0>65535fi:S46[!46]", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
diff --git a/android/mac/generated/flags.h b/android/mac/generated/flags.h
index a286b967..432f20da 100644
--- a/android/mac/generated/flags.h
+++ b/android/mac/generated/flags.h
@@ -601,9 +601,9 @@
 #undef FOR_devmem
 #endif
 
-// df   HPkhit*a[-HPkh]
+// df   HPkhit*a[-HPh]
 #undef OPTSTR_df
-#define OPTSTR_df "HPkhit*a[-HPkh]"
+#define OPTSTR_df "HPkhit*a[-HPh]"
 #ifdef CLEANUP_df
 #undef CLEANUP_df
 #undef FOR_df
diff --git a/android/mac/generated/newtoys.h b/android/mac/generated/newtoys.h
index d79b38ec..75a5d5ea 100644
--- a/android/mac/generated/newtoys.h
+++ b/android/mac/generated/newtoys.h
@@ -57,7 +57,7 @@ USE_DEMO_NUMBER(NEWTOY(demo_number, "D#=3<3M#<0hcdbs", TOYFLAG_BIN))
 USE_DEMO_SCANKEY(NEWTOY(demo_scankey, 0, TOYFLAG_BIN))
 USE_DEMO_UTF8TOWC(NEWTOY(demo_utf8towc, 0, TOYFLAG_USR|TOYFLAG_BIN))
 USE_DEVMEM(NEWTOY(devmem, "<1>3", TOYFLAG_USR|TOYFLAG_BIN))
-USE_DF(NEWTOY(df, "HPkhit*a[-HPkh]", TOYFLAG_SBIN))
+USE_DF(NEWTOY(df, "HPkhit*a[-HPh]", TOYFLAG_SBIN))
 USE_DHCP(NEWTOY(dhcp, "V:H:F:x*r:O*A#<0=20T#<0=3t#<0=3s:p:i:SBRCaovqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
 USE_DHCP6(NEWTOY(dhcp6, "r:A#<0T#<0t#<0s:p:i:SRvqnbf", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
 USE_DHCPD(NEWTOY(dhcpd, ">1P#<0>65535fi:S46[!46]", TOYFLAG_SBIN|TOYFLAG_ROOTONLY))
diff --git a/toys/posix/df.c b/toys/posix/df.c
index 0520923e..b8f298ff 100644
--- a/toys/posix/df.c
+++ b/toys/posix/df.c
@@ -4,7 +4,7 @@
  *
  * See http://opengroup.org/onlinepubs/9699919799/utilities/df.html
 
-USE_DF(NEWTOY(df, "HPkhit*a[-HPkh]", TOYFLAG_SBIN))
+USE_DF(NEWTOY(df, "HPkhit*a[-HPh]", TOYFLAG_SBIN))
 
 config DF
   bool "df"
@@ -63,7 +63,8 @@ static void print_header()
                       sizeof(char *)*4);
   else {
     if (!(FLAG(H)||FLAG(h))) {
-      dsuapm[1] = TT.units == 512 ? "512-blocks" : "1K-blocks";
+      dsuapm[1] = TT.units == 512 ? "512-blocks" :
+        FLAG(P) ? "1024-blocks" : "1K-blocks";
       dsuapm[3] = "Available";
       if (FLAG(P)) dsuapm[4] = "Capacity";
     }
@@ -142,7 +143,7 @@ void df_main(void)
 
   // Units are 512 bytes if you select "pedantic" without "kilobytes".
   if (FLAG(H)||FLAG(h)||FLAG(i)) TT.units = 1;
-  else TT.units = FLAG(P) ? 512 : 1024;
+  else TT.units = FLAG(P) && !FLAG(k) ? 512 : 1024;
 
   if (!(mtstart = xgetmountlist(0))) return;
   mtend = dlist_terminate(mtstart);
diff --git a/toys/posix/grep.c b/toys/posix/grep.c
index cd8928a1..52d10139 100644
--- a/toys/posix/grep.c
+++ b/toys/posix/grep.c
@@ -154,7 +154,7 @@ static void do_grep(int fd, char *name)
     lcount++;
     errno = 0;
     ulen = len = getdelim(&line, &ulen, TT.indelim, file);
-    if (errno) perror_msg("%s", name);
+    if (len == -1 && errno) perror_msg("%s", name);
     if (len<1) break;
     if (line[ulen-1] == TT.indelim) line[--ulen] = 0;