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

Change-Id: Icf1f8bf67f2c93c9157616cada7905e468d58948
diff --git a/toys/pending/vi.c b/toys/pending/vi.c
index 551184c..5086a0d 100644
--- a/toys/pending/vi.c
+++ b/toys/pending/vi.c
@@ -1472,7 +1472,7 @@
   if (TT.vi_mode == 2) printf("\x1b[1m-- INSERT --\x1b[m");
   if (!TT.vi_mode) printf("\x1b[1m%s \x1b[m",TT.il->data);
 
-  sprintf(toybuf, "%ld / %ld,%d,%d", TT.cursor, TT.filesize,
+  sprintf(toybuf, "%zu / %zu,%d,%d", TT.cursor, TT.filesize,
     TT.cur_row+1, TT.cur_col+1);
 
   if (TT.cur_col != cx_scr) sprintf(toybuf+strlen(toybuf),"-%d", cx_scr+1);