Revert "jsonpretty.go: sort strings of arrays - also updated all json files"

This reverts commit cf72f2cf40e1e6832ac11685c9b07baf242f0911.

Change-Id: I76735477280fcac3143925c237dbeabb371367f8

sys/src/9/amd64pv/core.json

@@ -48,25 +48,26 @@
 		"inith.json"
 	],
 	"SourceFiles": [
+		"entry.S",
+		"vsvm.c",
+		"l64v.S",
+		"l64fpu.S",
+		"cpuidamd64.S",
+		"l64acidt.S",
+		"l64idt.S",
+		"l64vsyscall.S",
 		"acore.c",
 		"apic.c",
 		"arch.c",
 		"archk10.c",
 		"asm.c",
 		"backtrace.c",
-		"cpuidamd64.S",
 		"ctype.c",
 		"devarch.c",
-		"entry.S",
 		"fpu.c",
 		"i8254.c",
 		"i8259.c",
 		"ioapic.c",
-		"l64acidt.S",
-		"l64fpu.S",
-		"l64idt.S",
-		"l64v.S",
-		"l64vsyscall.S",
 		"main.c",
 		"map.c",
 		"memory.c",
@@ -81,7 +82,6 @@
 		"syscall.c",
 		"systab.c",
 		"tcore.c",
-		"trap.c",
-		"vsvm.c"
+		"trap.c"
 	]
 }

sys/src/9/amd64pv/inith.json

@@ -30,7 +30,7 @@
 		"elf2c init \u003e init.h"
 	],
 	"SourceFiles": [
-		"../port/initcode.c",
-		"init9.c"
+		"init9.c",
+		"../port/initcode.c"
 	]
 }

sys/src/9/boot/boot.json

@@ -23,8 +23,8 @@
 	],
 	"SourceFiles": [
 		"aux.c",
-		"boot.c",
 		"bootauth.c",
+		"boot.c",
 		"bootcache.c",
 		"bootip.c",
 		"embed.c",

sys/src/9/boot/bootconf.json

@@ -38,7 +38,7 @@
 		"boot.json"
 	],
 	"SourceFiles": [
-		"bootk8cpu.c",
-		"printstub.c"
+		"printstub.c",
+		"bootk8cpu.c"
 	]
 }

sys/src/9/ip/ip.json

@@ -6,11 +6,11 @@
 		"../ip/devip.c",
 		"../ip/ethermedium.c",
 		"../ip/gre.c",
-		"../ip/icmp.c",
 		"../ip/icmp6.c",
+		"../ip/icmp.c",
 		"../ip/inferno.c",
-		"../ip/ip.c",
 		"../ip/ipaux.c",
+		"../ip/ip.c",
 		"../ip/ipifc.c",
 		"../ip/ipmux.c",
 		"../ip/iproute.c",

sys/src/9/k10/core.json

@@ -51,25 +51,26 @@
 		"inith.json"
 	],
 	"SourceFiles": [
+		"entry.S",
+		"vsvm.c",
+		"l64v.S",
+		"l64fpu.S",
+		"cpuidamd64.S",
+		"l64acidt.S",
+		"l64idt.S",
+		"l64vsyscall.S",
 		"acore.c",
 		"apic.c",
 		"arch.c",
 		"archk10.c",
 		"asm.c",
 		"backtrace.c",
-		"cpuidamd64.S",
 		"ctype.c",
 		"devarch.c",
-		"entry.S",
 		"fpu.c",
 		"i8254.c",
 		"i8259.c",
 		"ioapic.c",
-		"l64acidt.S",
-		"l64fpu.S",
-		"l64idt.S",
-		"l64v.S",
-		"l64vsyscall.S",
 		"main.c",
 		"map.c",
 		"memory.c",
@@ -84,7 +85,6 @@
 		"syscall.c",
 		"systab.c",
 		"tcore.c",
-		"trap.c",
-		"vsvm.c"
+		"trap.c"
 	]
 }

sys/src/9/k10/inith.json

@@ -29,7 +29,7 @@
 	],
 	"Program": "init",
 	"SourceFiles": [
-		"../port/initcode.c",
-		"init9.c"
+		"init9.c",
+		"../port/initcode.c"
 	]
 }

sys/src/9/port/port.json

@@ -4,11 +4,11 @@
 		"../port/alarm.c",
 		"../port/allocb.c",
 		"../port/cache.c",
+		"../port/devcec.c",
 		"../port/chan.c",
 		"../port/cpu_buffer.c",
-		"../port/dev.c",
 		"../port/devaoe.c",
-		"../port/devcec.c",
+		"../port/dev.c",
 		"../port/devcons.c",
 		"../port/devdup.c",
 		"../port/devenv.c",

sys/src/cmd/9nfs/9nfs.json

@@ -16,17 +16,17 @@
 		"9p.c",
 		"auth.c",
 		"authhostowner.c",
-		"chat.c",
-		"listalloc.c",
 		"nfs.c",
 		"nfsmount.c",
 		"nfsserver.c",
+		"xfile.c",
+		"chat.c",
 		"rpc.c",
-		"server.c",
 		"string.c",
 		"strparse.c",
 		"system.c",
-		"unixnames.c",
-		"xfile.c"
+		"listalloc.c",
+		"server.c",
+		"unixnames.c"
 	]
 }

sys/src/cmd/9nfs/pcnfsd.json

@@ -9,14 +9,14 @@
 	],
 	"Program": "pcnfsd",
 	"SourceFiles": [
-		"chat.c",
-		"listalloc.c",
 		"pcnfsd.c",
+		"unixnames.c",
+		"chat.c",
 		"rpc.c",
 		"server.c",
 		"string.c",
+		"listalloc.c",
 		"strparse.c",
-		"system.c",
-		"unixnames.c"
+		"system.c"
 	]
 }

sys/src/cmd/9nfs/portmapper.json

@@ -9,9 +9,9 @@
 	],
 	"Program": "portmapper",
 	"SourceFiles": [
-		"chat.c",
 		"portmapper.c",
 		"rpc.c",
+		"chat.c",
 		"server.c",
 		"string.c"
 	]

sys/src/cmd/auth/auth.json

@@ -26,8 +26,8 @@
 		"asn12dsa.c",
 		"asn12rsa.c",
 		"changeuser.c",
-		"convkeys.c",
 		"convkeys2.c",
+		"convkeys.c",
 		"cron.c",
 		"debug.c",
 		"dsagen.c",

sys/src/cmd/auth/lib/libauthcmd.json

@@ -9,19 +9,19 @@
 	"Library": "libauthcmd.a",
 	"Name": "libauthcmd",
 	"SourceFiles": [
-		"error.c",
-		"fs.c",
-		"getauthkey.c",
-		"getexpiration.c",
 		"keyfmt.c",
-		"log.c",
 		"netcheck.c",
 		"okpasswd.c",
-		"querybio.c",
-		"rdbio.c",
+		"readwrite.c",
 		"readarg.c",
 		"readln.c",
-		"readwrite.c",
-		"wrbio.c"
+		"getauthkey.c",
+		"log.c",
+		"error.c",
+		"fs.c",
+		"rdbio.c",
+		"querybio.c",
+		"wrbio.c",
+		"getexpiration.c"
 	]
 }

sys/src/cmd/auth/rsa2csr.json

@@ -9,7 +9,7 @@
 	],
 	"Program": "rsa2csr",
 	"SourceFiles": [
-		"rsa2any.c",
-		"rsa2csr.c"
+		"rsa2csr.c",
+		"rsa2any.c"
 	]
 }

sys/src/cmd/auth/rsa2pub.json

@@ -9,7 +9,7 @@
 	],
 	"Program": "rsa2pub",
 	"SourceFiles": [
-		"rsa2any.c",
-		"rsa2pub.c"
+		"rsa2pub.c",
+		"rsa2any.c"
 	]
 }

sys/src/cmd/auth/rsa2ssh.json

@@ -9,7 +9,7 @@
 	],
 	"Program": "rsa2ssh",
 	"SourceFiles": [
-		"rsa2any.c",
-		"rsa2ssh.c"
+		"rsa2ssh.c",
+		"rsa2any.c"
 	]
 }

sys/src/cmd/auth/rsa2x509.json

@@ -9,7 +9,7 @@
 	],
 	"Program": "rsa2x509",
 	"SourceFiles": [
-		"rsa2any.c",
-		"rsa2x509.c"
+		"rsa2x509.c",
+		"rsa2any.c"
 	]
 }

sys/src/cmd/auth/rsafill.json

@@ -9,7 +9,7 @@
 	],
 	"Program": "rsafill",
 	"SourceFiles": [
-		"rsa2any.c",
-		"rsafill.c"
+		"rsafill.c",
+		"rsa2any.c"
 	]
 }

sys/src/cmd/auth/secstore/secstore.json

@@ -11,10 +11,10 @@
 		"secuser.json"
 	],
 	"SourceFiles": [
-		"SConn.c",
 		"pak.c",
 		"password.c",
 		"secstore.c",
+		"SConn.c",
 		"util.c"
 	]
 }

sys/src/cmd/auth/secstore/secstored.json

@@ -6,12 +6,12 @@
 	"Name": "secstored",
 	"Program": "secstored",
 	"SourceFiles": [
-		"../secureidcheck.c",
-		"SConn.c",
 		"dirls.c",
 		"pak.c",
 		"password.c",
+		"SConn.c",
 		"secstored.c",
+		"../secureidcheck.c",
 		"util.c"
 	]
 }

sys/src/cmd/auth/secstore/secuser.json

@@ -6,9 +6,9 @@
 	"Name": "secuser",
 	"Program": "secuser",
 	"SourceFiles": [
-		"SConn.c",
 		"pak.c",
 		"password.c",
+		"SConn.c",
 		"secuser.c",
 		"util.c"
 	]

sys/src/cmd/aux/aux.json

@@ -27,10 +27,10 @@
 		"listen.c",
 		"listen1.c",
 		"mklatinkbd.c",
-		"mouse.c",
 		"ms2.c",
 		"msexceltables.c",
 		"mswordstrings.c",
+		"mouse.c",
 		"nfsmount.c",
 		"olefs.c",
 		"pcmcia.c",
@@ -42,10 +42,10 @@
 		"stub.c",
 		"timesync.c",
 		"trampoline.c",
-		"tty.c",
 		"usage.c",
 		"watchdog.c",
 		"write.c",
-		"zerotrunc.c"
+		"zerotrunc.c",
+		"tty.c"
 	]
 }

sys/src/cmd/aux/flashfs/dummyfs.json

@@ -6,11 +6,11 @@
 	"Name": "dummyfs",
 	"Program": "dummyfs",
 	"SourceFiles": [
-		"devfs.c",
-		"dreq.c",
 		"dummy.c",
+		"dreq.c",
 		"entry.c",
 		"errors.c",
+		"devfs.c",
 		"utils.c"
 	]
 }

sys/src/cmd/aux/flashfs/flashfsbin.json

@@ -6,13 +6,13 @@
 	"Name": "flashfsbin",
 	"Program": "flashfs",
 	"SourceFiles": [
-		"conv.c",
-		"devfs.c",
-		"entry.c",
-		"errors.c",
 		"flash.c",
 		"journal.c",
+		"entry.c",
+		"errors.c",
 		"request.c",
+		"devfs.c",
+		"conv.c",
 		"utils.c"
 	]
 }

sys/src/cmd/aux/flashfs/mkflashfs.json

@@ -6,8 +6,8 @@
 	"Name": "mkflashfs",
 	"Program": "mkflashfs",
 	"SourceFiles": [
-		"devfs.c",
 		"mkfs.c",
+		"devfs.c",
 		"utils.c"
 	]
 }

sys/src/cmd/aux/flashfs/testldfs.json

@@ -6,12 +6,12 @@
 	"Name": "testldfs",
 	"Program": "testldfs",
 	"SourceFiles": [
-		"conv.c",
-		"devfs.c",
+		"testld.c",
+		"journal.c",
 		"entry.c",
 		"errors.c",
-		"journal.c",
-		"testld.c",
+		"devfs.c",
+		"conv.c",
 		"utils.c"
 	]
 }

sys/src/cmd/aux/gps/gps.json

@@ -9,7 +9,7 @@
 		"gpsevermore.json"
 	],
 	"SourceFiles": [
-		"gpsfs.c",
-		"util.c"
+		"util.c",
+		"gpsfs.c"
 	]
 }

sys/src/cmd/aux/gps/gpsevermore.json

@@ -6,7 +6,7 @@
 	"Name": "gpsevermore",
 	"Program": "gpsevermore",
 	"SourceFiles": [
-		"gpsevermore.c",
-		"util.c"
+		"util.c",
+		"gpsevermore.c"
 	]
 }

sys/src/cmd/aux/vga/vga.json

@@ -6,45 +6,45 @@
 	"Name": "vga",
 	"Program": "vga",
 	"SourceFiles": [
-		"ch9294.c",
-		"clgd542x.c",
-		"clgd546x.c",
-		"data.c",
-		"db.c",
 		"error.c",
-		"icd2061a.c",
-		"ics2494.c",
 		"ics534x.c",
+		"radeon.c",
+		"s3928.c",
+		"sc15025.c",
+		"trio64.c",
+		"tvp3026.c",
+		"vga.c",
+		"vision968.c",
+		"ch9294.c",
 		"io.c",
 		"main.c",
 		"nvidia.c",
-		"palette.c",
-		"pci.c",
-		"radeon.c",
 		"rgb524.c",
-		"rgb524mn.c",
-		"s3801.c",
-		"s3928.c",
 		"s3clock.c",
-		"s3generic.c",
-		"s3hwgc.c",
-		"sc15025.c",
 		"stg1702.c",
-		"t2r4.c",
-		"template.c",
-		"trio64.c",
 		"tvp3020.c",
-		"tvp3025.c",
-		"tvp3025clock.c",
-		"tvp3026.c",
 		"tvp3026clock.c",
-		"vesa.c",
-		"vesadb.c",
-		"vga.c",
 		"virge.c",
+		"vmware.c",
+		"clgd542x.c",
+		"data.c",
+		"icd2061a.c",
+		"palette.c",
+		"rgb524mn.c",
+		"s3generic.c",
+		"t2r4.c",
+		"tvp3025.c",
+		"vesa.c",
 		"vision864.c",
-		"vision964.c",
-		"vision968.c",
-		"vmware.c"
+		"clgd546x.c",
+		"db.c",
+		"ics2494.c",
+		"pci.c",
+		"s3801.c",
+		"s3hwgc.c",
+		"template.c",
+		"tvp3025clock.c",
+		"vesadb.c",
+		"vision964.c"
 	]
 }

sys/src/cmd/cifs/cifs.json

@@ -8,22 +8,22 @@
 	],
 	"Program": "cifs",
 	"SourceFiles": [
-		"auth.c",
+		"main.c",
+		"transnt.c",
+		"trans2.c",
+		"trans.c",
 		"cifs.c",
-		"dfs.c",
-		"doserrstr.c",
-		"fs.c",
+		"netbios.c",
+		"pack.c",
 		"info.c",
-		"main.c",
+		"fs.c",
+		"sid2name.c",
 		"misc.c",
-		"netbios.c",
 		"nterrstr.c",
-		"pack.c",
-		"ping.c",
+		"doserrstr.c",
 		"raperrstr.c",
-		"sid2name.c",
-		"trans.c",
-		"trans2.c",
-		"transnt.c"
+		"auth.c",
+		"dfs.c",
+		"ping.c"
 	]
 }

sys/src/cmd/cmds.json

@@ -90,8 +90,8 @@
 		"nm.c",
 		"nntpfs.c",
 		"ns.c",
-		"p.c",
 		"pbd.c",
+		"p.c",
 		"pcc.c",
 		"pipefile.c",
 		"pr.c",
@@ -125,15 +125,15 @@
 		"tail.c",
 		"tar.c",
 		"tee.c",
-		"test.c",
 		"testalarm.c",
+		"test.c",
 		"time.c",
 		"tlsclient.c",
 		"tlssrv.c",
 		"touch.c",
 		"tprof.c",
-		"tr.c",
 		"trace.c",
+		"tr.c",
 		"tweak.c",
 		"unicode.c",
 		"uniq.c",

sys/src/cmd/con/con.json

@@ -11,8 +11,8 @@
 	],
 	"SourceFilesCmd": [
 		"con.c",
-		"hayes.c",
+		"xms.c",
 		"xmr.c",
-		"xms.c"
+		"hayes.c"
 	]
 }

sys/src/cmd/disk/disk.json

@@ -12,10 +12,10 @@
 	"SourceFilesCmd": [
 		"exsort.c",
 		"format.c",
-		"kfscmd.c",
 		"mbr.c",
 		"mkext.c",
 		"mkfs.c",
-		"partfs.c"
+		"partfs.c",
+		"kfscmd.c"
 	]
 }

sys/src/cmd/disk/kfs/kfs.json

@@ -2,28 +2,29 @@
 	"Include": [
 		"../../cmd.json"
 	],
-	"Install": "/$ARCH/bin/disk",
 	"Name": "kfs",
+	"Install": "/$ARCH/bin/disk",
 	"Program": "kfs",
 	"SourceFiles": [
 		"9p1.c",
-		"9p12.c",
 		"9p1lib.c",
 		"9p2.c",
+		"9p12.c",
 		"auth.c",
 		"chk.c",
 		"con.c",
 		"console.c",
 		"dat.c",
 		"dentry.c",
-		"devwren.c",
 		"ialloc.c",
 		"iobuf.c",
 		"main.c",
 		"misc.c",
-		"ofcallfmt.c",
 		"porttime.c",
 		"sub.c",
-		"uid.c"
+		"uid.c",
+		"ofcallfmt.c",
+		"devwren.c"
 	]
 }
+

sys/src/cmd/disk/prep/fdisk.json

@@ -12,8 +12,8 @@
 	],
 	"Program": "fdisk",
 	"SourceFiles": [
-		"edit.c",
 		"fdisk.c",
+		"edit.c",
 		"y.tab.c"
 	]
 }

sys/src/cmd/disk/prep/prep.json

@@ -12,8 +12,8 @@
 	],
 	"Program": "prep",
 	"SourceFiles": [
-		"edit.c",
 		"prep.c",
+		"edit.c",
 		"y.tab.c"
 	]
 }

sys/src/cmd/dossrv/dossrv.json

@@ -8,13 +8,13 @@
 	],
 	"Program": "dossrv",
 	"SourceFiles": [
-		"chat.c",
-		"devio.c",
+		"xfssrv.c",
+		"xfile.c",
 		"dosfs.c",
 		"dossubs.c",
 		"iotrack.c",
 		"lock.c",
-		"xfile.c",
-		"xfssrv.c"
+		"chat.c",
+		"devio.c"
 	]
 }

sys/src/cmd/fossil/flchk.json

@@ -6,21 +6,22 @@
 	"Name": "flchk",
 	"Program": "flchk",
 	"SourceFiles": [
+		"9p.c",
 		"9auth.c",
 		"9dir.c",
 		"9excl.c",
 		"9fid.c",
 		"9fsys.c",
 		"9lstn.c",
-		"9p.c",
 		"9proc.c",
 		"9srv.c",
 		"9user.c",
-		"Ccli.c",
 		"Ccmd.c",
+		"Ccli.c",
 		"Ccons.c",
 		"Clog.c",
 		"archive.c",
+		"nobwatch.c",
 		"cache.c",
 		"check.c",
 		"disk.c",
@@ -28,7 +29,6 @@
 		"file.c",
 		"flchk.c",
 		"fs.c",
-		"nobwatch.c",
 		"pack.c",
 		"periodic.c",
 		"source.c",

sys/src/cmd/fossil/flfmt.json

@@ -6,30 +6,30 @@
 	"Name": "flfmt",
 	"Program": "flfmt",
 	"SourceFiles": [
+		"9p.c",
 		"9auth.c",
 		"9dir.c",
 		"9excl.c",
 		"9fid.c",
 		"9fsys.c",
 		"9lstn.c",
-		"9p.c",
 		"9proc.c",
 		"9srv.c",
 		"9user.c",
-		"Ccli.c",
 		"Ccmd.c",
+		"Ccli.c",
 		"Ccons.c",
 		"Clog.c",
 		"archive.c",
+		"nobwatch.c",
 		"cache.c",
 		"check.c",
 		"disk.c",
 		"error.c",
 		"file.c",
-		"flfmt.c",
 		"flfmt9660.c",
+		"flfmt.c",
 		"fs.c",
-		"nobwatch.c",
 		"pack.c",
 		"periodic.c",
 		"source.c",

sys/src/cmd/fossil/fossil.json

@@ -22,21 +22,22 @@
 		"last.json"
 	],
 	"SourceFiles": [
+		"9p.c",
 		"9auth.c",
 		"9dir.c",
 		"9excl.c",
 		"9fid.c",
 		"9fsys.c",
 		"9lstn.c",
-		"9p.c",
 		"9proc.c",
 		"9srv.c",
 		"9user.c",
-		"Ccli.c",
 		"Ccmd.c",
+		"Ccli.c",
 		"Ccons.c",
 		"Clog.c",
 		"archive.c",
+		"nobwatch.c",
 		"cache.c",
 		"check.c",
 		"disk.c",
@@ -44,7 +45,6 @@
 		"file.c",
 		"fossil.c",
 		"fs.c",
-		"nobwatch.c",
 		"pack.c",
 		"periodic.c",
 		"source.c",

sys/src/cmd/fossil/last.json

@@ -6,29 +6,29 @@
 	"Name": "last",
 	"Program": "last",
 	"SourceFiles": [
+		"9p.c",
 		"9auth.c",
 		"9dir.c",
 		"9excl.c",
 		"9fid.c",
 		"9fsys.c",
 		"9lstn.c",
-		"9p.c",
 		"9proc.c",
 		"9srv.c",
 		"9user.c",
-		"Ccli.c",
 		"Ccmd.c",
+		"Ccli.c",
 		"Ccons.c",
 		"Clog.c",
 		"archive.c",
+		"nobwatch.c",
 		"cache.c",
 		"check.c",
 		"disk.c",
 		"error.c",
 		"file.c",
-		"fs.c",
 		"last.c",
-		"nobwatch.c",
+		"fs.c",
 		"pack.c",
 		"periodic.c",
 		"source.c",

sys/src/cmd/ip/dhcpd/dhcpd.json

@@ -6,9 +6,9 @@
 	"Name": "dhcpd",
 	"Program": "dhcpd",
 	"SourceFiles": [
-		"db.c",
 		"dhcpd.c",
+		"db.c",
 		"ndb.c",
 		"ping.c"
 	]
-}
+}

sys/src/cmd/ip/dhcpd/dhcpleases.json

@@ -6,8 +6,8 @@
 	"Name": "dhcpleases",
 	"Program": "dhcpleases",
 	"SourceFiles": [
-		"db.c",
 		"dhcpleases.c",
+		"db.c",
 		"ping.c"
 	]
-}
+}

sys/src/cmd/ip/ftpd.json

@@ -9,4 +9,4 @@
 		"ftpd.c",
 		"glob.c"
 	]
-}
+}

sys/src/cmd/ip/ftpfs/ftpfs.json

@@ -6,8 +6,8 @@
 	"Name": "ftpfs",
 	"Program": "ftpfs",
 	"SourceFiles": [
-		"file.c",
 		"ftpfs.c",
-		"proto.c"
+		"proto.c",
+		"file.c"
 	]
-}
+}

sys/src/cmd/ip/httpd/httpd.json

@@ -2,22 +2,22 @@
 	"Include": [
 		"/sys/src/cmd/cmd.json"
 	],
-	"Install": "/$ARCH/bin/ip",
-	"Name": "httpdcmds",
-	"Oflags": [
-		"libhttps.a"
-	],
 	"Projects": [
 		"libhttps.json"
 	],
+	"Install": "/$ARCH/bin/ip",
+	"Name": "httpdcmds",
 	"SourceFilesCmd": [
 		"httpd.c",
 		"imagemap.c",
 		"man2html.c",
+		"save.c",
 		"netlib_find.c",
 		"netlib_history.c",
-		"save.c",
 		"webls.c",
 		"wikipost.c"
+	],
+	"Oflags": [
+		"libhttps.a"
 	]
 }

sys/src/cmd/ip/httpd/libhttps.json

@@ -7,13 +7,13 @@
 	"Name": "libhttps",
 	"SourceFiles": [
 		"anonymous.c",
-		"authorize.c",
 		"content.c",
 		"emem.c",
 		"hints.c",
 		"init.c",
 		"log.c",
 		"redirect.c",
-		"sendfd.c"
+		"sendfd.c",
+		"authorize.c"
 	]
 }

sys/src/cmd/ip/imap4d/imap4d.json

@@ -10,17 +10,17 @@
 		"copy.c",
 		"csquery.c",
 		"date.c",
-		"debug.c",
 		"fetch.c",
-		"folder.c",
 		"imap4d.c",
 		"list.c",
 		"mbox.c",
 		"msg.c",
 		"mutf7.c",
 		"nodes.c",
+		"folder.c",
 		"search.c",
 		"store.c",
-		"utils.c"
+		"utils.c",
+		"debug.c"
 	]
-}
+}

sys/src/cmd/ip/ip.json

@@ -4,23 +4,13 @@
 	],
 	"Install": "/$ARCH/bin/ip",
 	"Name": "ipcmds",
-	"Projects": [
-		"ftpd.json",
-		"dhcpd/dhcpd.json",
-		"dhcpd/dhcpleases.json",
-		"ftpfs/ftpfs.json",
-		"httpd/httpd.json",
-		"imap4d/imap4d.json",
-		"ipconfig/ipconfig.json",
-		"ppp/ppp.json"
-	],
 	"SourceFilesCmd": [
+		"ping.c",
 		"dhcpclient.c",
 		"gping.c",
 		"hogports.c",
 		"httpfile.c",
 		"linklocal.c",
-		"ping.c",
 		"pppoe.c",
 		"pptp.c",
 		"pptpd.c",
@@ -34,5 +24,15 @@
 		"traceroute.c",
 		"udpecho.c",
 		"wol.c"
+	],
+	"Projects": [
+		"ftpd.json",
+		"dhcpd/dhcpd.json",
+		"dhcpd/dhcpleases.json",
+		"ftpfs/ftpfs.json",
+		"httpd/httpd.json",
+		"imap4d/imap4d.json",
+		"ipconfig/ipconfig.json",
+		"ppp/ppp.json"
 	]
 }

sys/src/cmd/ip/ppp/ppp.json

@@ -6,11 +6,11 @@
 	"Name": "ppp",
 	"Program": "ppp",
 	"SourceFiles": [
-		"block.c",
+		"ppp.c",
 		"compress.c",
-		"ipaux.c",
+		"block.c",
 		"mppc.c",
-		"ppp.c",
+		"ipaux.c",
 		"thw.c",
 		"thwack.c",
 		"unthwack.c"

sys/src/cmd/kcmds.json

@@ -18,10 +18,10 @@
 	],
 	"SourceFilesCmd": [
 		"bind.c",
+		"mount.c",
 		"date.c",
+		"srv.c",
 		"echo.c",
-		"ls.c",
-		"mount.c",
-		"srv.c"
+		"ls.c"
 	]
 }

sys/src/lib9p/lib9p.json

@@ -13,9 +13,9 @@
 		"intmap.c",
 		"listen.c",
 		"mem.c",
+		"req.c",
 		"parse.c",
 		"post.c",
-		"req.c",
 		"rfork.c",
 		"srv.c",
 		"thread.c",

sys/src/libbio/libbio.json

@@ -9,19 +9,19 @@
 		"bbuffered.c",
 		"bfildes.c",
 		"bflush.c",
+		"bgetrune.c",
 		"bgetc.c",
 		"bgetd.c",
-		"bgetrune.c",
 		"binit.c",
 		"boffset.c",
 		"bprint.c",
-		"bputc.c",
 		"bputrune.c",
+		"bputc.c",
 		"brdline.c",
 		"brdstr.c",
 		"bread.c",
 		"bseek.c",
-		"bvprint.c",
-		"bwrite.c"
+		"bwrite.c",
+		"bvprint.c"
 	]
 }

sys/src/libc/klibc.json

@@ -30,8 +30,8 @@
 		"9sys/dirwstat.c",
 		"9sys/fcallfmt.c",
 		"9sys/fork.c",
-		"9sys/getenv.c",
 		"9sys/getnetconninfo.c",
+		"9sys/getenv.c",
 		"9sys/getpid.c",
 		"9sys/getppid.c",
 		"9sys/getwd.c",
@@ -59,15 +59,6 @@
 		"9sys/waitpid.c",
 		"9sys/werrstr.c",
 		"9sys/writev.c",
-		"9syscall/_errstr.s",
-		"9syscall/_exits.s",
-		"9syscall/_fsession.s",
-		"9syscall/_fstat.s",
-		"9syscall/_fwstat.s",
-		"9syscall/_mount.s",
-		"9syscall/_stat.s",
-		"9syscall/_wait.s",
-		"9syscall/_wstat.s",
 		"9syscall/alarm.s",
 		"9syscall/await.s",
 		"9syscall/bind.s",
@@ -76,14 +67,20 @@
 		"9syscall/close.s",
 		"9syscall/create.s",
 		"9syscall/dup.s",
+		"9syscall/_errstr.s",
 		"9syscall/errstr.s",
-		"9syscall/exec.s",
 		"9syscall/execac.s",
+		"9syscall/exec.s",
+		"9syscall/_exits.s",
 		"9syscall/fauth.s",
 		"9syscall/fd2path.s",
+		"9syscall/_fsession.s",
+		"9syscall/_fstat.s",
 		"9syscall/fstat.s",
 		"9syscall/fversion.s",
+		"9syscall/_fwstat.s",
 		"9syscall/fwstat.s",
+		"9syscall/_mount.s",
 		"9syscall/mount.s",
 		"9syscall/nixsyscall.s",
 		"9syscall/noted.s",
@@ -110,25 +107,18 @@
 		"9syscall/semsleep.s",
 		"9syscall/semwakeup.s",
 		"9syscall/sleep.s",
+		"9syscall/_stat.s",
 		"9syscall/stat.s",
 		"9syscall/sysr1.s",
 		"9syscall/tsemacquire.s",
 		"9syscall/unmount.s",
+		"9syscall/_wait.s",
 		"9syscall/write.s",
+		"9syscall/_wstat.s",
 		"9syscall/wstat.s",
 		"9syscall/ziofree.s",
 		"9syscall/ziopread.s",
 		"9syscall/ziopwrite.s",
-		"amd64/_seek.c",
-		"amd64/argv0.c",
-		"amd64/atom.S",
-		"amd64/cycles.c",
-		"amd64/main9.S",
-		"amd64/notejmp.c",
-		"amd64/rdpmc.c",
-		"amd64/setjmp.s",
-		"amd64/sqrt.s",
-		"amd64/tas.s",
 		"fmt/dofmt.c",
 		"fmt/dorfmt.c",
 		"fmt/errfmt.c",
@@ -169,10 +159,10 @@
 		"port/atof.c",
 		"port/atol.c",
 		"port/atoll.c",
-		"port/charstod.c",
 		"port/cistrcmp.c",
 		"port/cistrncmp.c",
 		"port/cistrstr.c",
+		"port/charstod.c",
 		"port/cleanname.c",
 		"port/ctype.c",
 		"port/encodefmt.c",
@@ -222,13 +212,13 @@
 		"port/runestrchr.c",
 		"port/runestrcmp.c",
 		"port/runestrcpy.c",
-		"port/runestrdup.c",
 		"port/runestrecpy.c",
-		"port/runestrlen.c",
+		"port/runestrdup.c",
 		"port/runestrncat.c",
 		"port/runestrncmp.c",
 		"port/runestrncpy.c",
 		"port/runestrrchr.c",
+		"port/runestrlen.c",
 		"port/runestrstr.c",
 		"port/runetype.c",
 		"port/sin.c",
@@ -238,9 +228,9 @@
 		"port/strchr.c",
 		"port/strcmp.c",
 		"port/strcpy.c",
+		"port/strecpy.c",
 		"port/strcspn.c",
 		"port/strdup.c",
-		"port/strecpy.c",
 		"port/strlen.c",
 		"port/strncat.c",
 		"port/strncmp.c",
@@ -259,14 +249,24 @@
 		"port/tanh.c",
 		"port/tokenize.c",
 		"port/toupper.c",
-		"port/u16.c",
-		"port/u32.c",
-		"port/u64.c",
 		"port/utfecpy.c",
 		"port/utflen.c",
 		"port/utfnlen.c",
-		"port/utfrrune.c",
 		"port/utfrune.c",
-		"port/utfutf.c"
+		"port/utfrrune.c",
+		"port/utfutf.c",
+		"port/u16.c",
+		"port/u32.c",
+		"port/u64.c",
+		"amd64/_seek.c",
+		"amd64/notejmp.c",
+		"amd64/cycles.c",
+		"amd64/argv0.c",
+		"amd64/rdpmc.c",
+		"amd64/setjmp.s",
+		"amd64/sqrt.s",
+		"amd64/tas.s",
+		"amd64/atom.S",
+		"amd64/main9.S"
 	]
 }

sys/src/libc/libc.json

@@ -30,8 +30,8 @@
 		"9sys/dirwstat.c",
 		"9sys/fcallfmt.c",
 		"9sys/fork.c",
-		"9sys/getenv.c",
 		"9sys/getnetconninfo.c",
+		"9sys/getenv.c",
 		"9sys/getpid.c",
 		"9sys/getppid.c",
 		"9sys/getwd.c",
@@ -59,15 +59,6 @@
 		"9sys/waitpid.c",
 		"9sys/werrstr.c",
 		"9sys/writev.c",
-		"9syscall/_errstr.s",
-		"9syscall/_exits.s",
-		"9syscall/_fsession.s",
-		"9syscall/_fstat.s",
-		"9syscall/_fwstat.s",
-		"9syscall/_mount.s",
-		"9syscall/_stat.s",
-		"9syscall/_wait.s",
-		"9syscall/_wstat.s",
 		"9syscall/alarm.s",
 		"9syscall/await.s",
 		"9syscall/bind.s",
@@ -76,14 +67,20 @@
 		"9syscall/close.s",
 		"9syscall/create.s",
 		"9syscall/dup.s",
+		"9syscall/_errstr.s",
 		"9syscall/errstr.s",
-		"9syscall/exec.s",
 		"9syscall/execac.s",
+		"9syscall/exec.s",
+		"9syscall/_exits.s",
 		"9syscall/fauth.s",
 		"9syscall/fd2path.s",
+		"9syscall/_fsession.s",
+		"9syscall/_fstat.s",
 		"9syscall/fstat.s",
 		"9syscall/fversion.s",
+		"9syscall/_fwstat.s",
 		"9syscall/fwstat.s",
+		"9syscall/_mount.s",
 		"9syscall/mount.s",
 		"9syscall/nixsyscall.s",
 		"9syscall/noted.s",
@@ -110,25 +107,18 @@
 		"9syscall/semsleep.s",
 		"9syscall/semwakeup.s",
 		"9syscall/sleep.s",
+		"9syscall/_stat.s",
 		"9syscall/stat.s",
 		"9syscall/sysr1.s",
 		"9syscall/tsemacquire.s",
 		"9syscall/unmount.s",
+		"9syscall/_wait.s",
 		"9syscall/write.s",
+		"9syscall/_wstat.s",
 		"9syscall/wstat.s",
 		"9syscall/ziofree.s",
 		"9syscall/ziopread.s",
 		"9syscall/ziopwrite.s",
-		"amd64/_seek.c",
-		"amd64/argv0.c",
-		"amd64/atom.S",
-		"amd64/cycles.c",
-		"amd64/main9.S",
-		"amd64/notejmp.c",
-		"amd64/rdpmc.c",
-		"amd64/setjmp.s",
-		"amd64/sqrt.s",
-		"amd64/tas.s",
 		"fmt/dofmt.c",
 		"fmt/dorfmt.c",
 		"fmt/errfmt.c",
@@ -169,10 +159,10 @@
 		"port/atof.c",
 		"port/atol.c",
 		"port/atoll.c",
-		"port/charstod.c",
 		"port/cistrcmp.c",
 		"port/cistrncmp.c",
 		"port/cistrstr.c",
+		"port/charstod.c",
 		"port/cleanname.c",
 		"port/ctype.c",
 		"port/encodefmt.c",
@@ -222,13 +212,13 @@
 		"port/runestrchr.c",
 		"port/runestrcmp.c",
 		"port/runestrcpy.c",
-		"port/runestrdup.c",
 		"port/runestrecpy.c",
-		"port/runestrlen.c",
+		"port/runestrdup.c",
 		"port/runestrncat.c",
 		"port/runestrncmp.c",
 		"port/runestrncpy.c",
 		"port/runestrrchr.c",
+		"port/runestrlen.c",
 		"port/runestrstr.c",
 		"port/runetype.c",
 		"port/sin.c",
@@ -238,9 +228,9 @@
 		"port/strchr.c",
 		"port/strcmp.c",
 		"port/strcpy.c",
+		"port/strecpy.c",
 		"port/strcspn.c",
 		"port/strdup.c",
-		"port/strecpy.c",
 		"port/strlen.c",
 		"port/strncat.c",
 		"port/strncmp.c",
@@ -259,14 +249,24 @@
 		"port/tanh.c",
 		"port/tokenize.c",
 		"port/toupper.c",
-		"port/u16.c",
-		"port/u32.c",
-		"port/u64.c",
 		"port/utfecpy.c",
 		"port/utflen.c",
 		"port/utfnlen.c",
-		"port/utfrrune.c",
 		"port/utfrune.c",
-		"port/utfutf.c"
+		"port/utfrrune.c",
+		"port/utfutf.c",
+		"port/u16.c",
+		"port/u32.c",
+		"port/u64.c",
+		"amd64/_seek.c",
+		"amd64/notejmp.c",
+		"amd64/cycles.c",
+		"amd64/argv0.c",
+		"amd64/rdpmc.c",
+		"amd64/setjmp.s",
+		"amd64/sqrt.s",
+		"amd64/tas.s",
+		"amd64/atom.S",
+		"amd64/main9.S"
 	]
 }

sys/src/libdraw/klibdraw.json

@@ -36,13 +36,13 @@
 		"init.c",
 		"keyboard.c",
 		"line.c",
-		"loadimage.c",
 		"menuhit.c",
 		"mkfont.c",
 		"mouse.c",
 		"newwindow.c",
 		"openfont.c",
 		"poly.c",
+		"loadimage.c",
 		"readcolmap.c",
 		"readimage.c",
 		"readsubfont.c",

sys/src/libdraw/libdraw.json

@@ -36,13 +36,13 @@
 		"init.c",
 		"keyboard.c",
 		"line.c",
-		"loadimage.c",
 		"menuhit.c",
 		"mkfont.c",
 		"mouse.c",
 		"newwindow.c",
 		"openfont.c",
 		"poly.c",
+		"loadimage.c",
 		"readcolmap.c",
 		"readimage.c",
 		"readsubfont.c",

sys/src/libflate/libflate.json

@@ -6,16 +6,16 @@
 	"Library": "libflate.a",
 	"Name": "libflate",
 	"SourceFiles": [
-		"adler.c",
-		"crc.c",
 		"deflate.c",
-		"deflateblock.c",
 		"deflatezlib.c",
+		"deflateblock.c",
 		"deflatezlibblock.c",
-		"flateerr.c",
 		"inflate.c",
-		"inflateblock.c",
 		"inflatezlib.c",
-		"inflatezlibblock.c"
+		"inflateblock.c",
+		"inflatezlibblock.c",
+		"flateerr.c",
+		"crc.c",
+		"adler.c"
 	]
 }

sys/src/libframe/libframe.json

@@ -7,8 +7,8 @@
 	"Name": "libframe",
 	"SourceFiles": [
 		"frbox.c",
-		"frdelete.c",
 		"frdraw.c",
+		"frdelete.c",
 		"frinit.c",
 		"frinsert.c",
 		"frptofchar.c",

sys/src/libip/klibip.json

@@ -6,16 +6,16 @@
 	"Library": "klibip.a",
 	"Name": "KernelLibip",
 	"SourceFiles": [
-		"bo.c",
-		"classmask.c",
 		"eipfmt.c",
 		"equivip.c",
-		"ipaux.c",
+		"parseip.c",
+		"parseether.c",
 		"myetheraddr.c",
 		"myipaddr.c",
-		"parseether.c",
-		"parseip.c",
-		"ptclbsum.c",
-		"readipifc.c"
+		"classmask.c",
+		"bo.c",
+		"readipifc.c",
+		"ipaux.c",
+		"ptclbsum.c"
 	]
 }

sys/src/libip/libip.json

@@ -6,16 +6,16 @@
 	"Library": "libip.a",
 	"Name": "Libip",
 	"SourceFiles": [
-		"bo.c",
-		"classmask.c",
 		"eipfmt.c",
 		"equivip.c",
-		"ipaux.c",
+		"parseip.c",
+		"parseether.c",
 		"myetheraddr.c",
 		"myipaddr.c",
-		"parseether.c",
-		"parseip.c",
-		"ptclbsum.c",
-		"readipifc.c"
+		"classmask.c",
+		"bo.c",
+		"readipifc.c",
+		"ipaux.c",
+		"ptclbsum.c"
 	]
 }

sys/src/liboventi/liboventi.json

@@ -13,14 +13,14 @@
 		"pack.c",
 		"packet.c",
 		"parsescore.c",
-		"plan9-io.c",
-		"plan9-sha1.c",
-		"plan9-thread.c",
 		"readfully.c",
 		"rpc.c",
 		"scorefmt.c",
 		"server.c",
 		"strdup.c",
-		"zero.c"
+		"zero.c",
+		"plan9-io.c",
+		"plan9-sha1.c",
+		"plan9-thread.c"
 	]
 }

sys/src/libregexp/libregexp.json

@@ -6,11 +6,11 @@
 	"Library": "libregexp.a",
 	"Name": "libregexp",
 	"SourceFiles": [
-		"regaux.c",
 		"regcomp.c",
 		"regerror.c",
 		"regexec.c",
 		"regsub.c",
+		"regaux.c",
 		"rregexec.c",
 		"rregsub.c"
 	]

sys/src/libsec/libsec.json

@@ -10,9 +10,9 @@
 		"port/blowfish.c",
 		"port/crypt.c",
 		"port/decodepem.c",
-		"port/des.c",
 		"port/des3CBC.c",
 		"port/des3ECB.c",
+		"port/des.c",
 		"port/desCBC.c",
 		"port/desECB.c",
 		"port/desmodes.c",
@@ -36,8 +36,8 @@
 		"port/genstrongprime.c",
 		"port/hmac.c",
 		"port/md4.c",
-		"port/md5.c",
 		"port/md5block.c",
+		"port/md5.c",
 		"port/md5pickle.c",
 		"port/nfastrand.c",
 		"port/prng.c",
@@ -50,8 +50,8 @@
 		"port/rsafill.c",
 		"port/rsagen.c",
 		"port/rsaprivtopub.c",
-		"port/sha1.c",
 		"port/sha1block.c",
+		"port/sha1.c",
 		"port/sha1pickle.c",
 		"port/sha2_128.c",
 		"port/sha2_64.c",

sys/src/libsunrpc/libsunrpc.json

@@ -6,16 +6,16 @@
 	"Library": "libsunrpc.a",
 	"Name": "libsunrpc",
 	"SourceFiles": [
+		"mount3.c",
+		"nfs3.c",
+		"portmap.c",
 		"authunix.c",
 		"client.c",
 		"emalloc.c",
 		"error.c",
 		"fd.c",
 		"fmt.c",
-		"mount3.c",
 		"net.c",
-		"nfs3.c",
-		"portmap.c",
 		"prog.c",
 		"rpc.c",
 		"server.c",

sys/src/libventi/libventi.json

@@ -9,8 +9,8 @@
 		"cache.c",
 		"client.c",
 		"conn.c",
-		"debug.c",
 		"dial.c",
+		"debug.c",
 		"dtype.c",
 		"entry.c",
 		"fcall.c",

sys/src/regress/regress.json

@@ -5,16 +5,16 @@
 	"Install": "/$ARCH/bin/regress",
 	"Name": "Regress",
 	"SourceFilesCmd": [
-		"args.c",
-		"execl.c",
-		"fork.c",
 		"iphash.c",
-		"longjmp.c",
 		"privates.c",
+		"fork.c",
+		"thread.c",
+		"longjmp.c",
 		"psx.c",
+		"args.c",
 		"syscall.c",
 		"sysfatal.c",
-		"thread.c",
+		"execl.c",
 		"va_copy.c"
 	]
 }

util/jsonpretty.go

@@ -5,8 +5,6 @@ import (
 	"fmt"
 	"io/ioutil"
 	"os"
-	"sort"
-	"strings"
 )
 
 func main() {
@@ -36,19 +34,6 @@ func main() {
 		case []interface{}:
 			if len(tval) == 0 {
 				delete(jsmap, key)
-			} else if strings.Contains(key, "SourceFiles") {
-				var stuff []string
-				for _, el := range tval {
-					switch eval := el.(type) {
-					case string:
-						stuff = append(stuff, eval)
-					default:
-						fmt.Printf("jsonpretty: non-string array member in %v\n", key)
-						os.Exit(1)
-					}
-				}
-				sort.Strings(stuff)
-				jsmap[key] = stuff
 			}
 		}
 	}