Module Name: othersrc
Committed By: agc
Date: Fri Nov 20 22:26:16 UTC 2015
Modified Files:
othersrc/external/bsd/sid/bin: 1.expected
othersrc/external/bsd/sid/dist: sid.c sid.h
Log Message:
Update sid to version 20151120
+ Use the generic "array grow" function in multiple places
+ Bump version to 20151120
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/sid/bin/1.expected
cvs rdiff -u -r1.3 -r1.4 othersrc/external/bsd/sid/dist/sid.c \
othersrc/external/bsd/sid/dist/sid.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: othersrc/external/bsd/sid/bin/1.expected
diff -u othersrc/external/bsd/sid/bin/1.expected:1.3 othersrc/external/bsd/sid/bin/1.expected:1.4
--- othersrc/external/bsd/sid/bin/1.expected:1.3 Thu Nov 12 21:01:29 2015
+++ othersrc/external/bsd/sid/bin/1.expected Fri Nov 20 22:26:16 2015
@@ -64,7 +64,7 @@
{"name":"/bin/tar","perms":0555,"ftype":"file","ino":1764557,"nlink":3,"uid":0,"gid":0,"size":154160,"blocks":304,"mtime":1444422927,"ctime":1444521101,"flags":0,"sha256":"bdabb62c796542329d64c6173dbfdc63fe308b3f096ef640f71d430f97d6abbf","crc32c":"70bea5b0"},
{"name":"/bin/tcsh","perms":0755,"ftype":"file","ino":1764259,"nlink":1,"uid":0,"gid":0,"size":1087288,"blocks":2176,"mtime":1400308596,"ctime":1400308597,"flags":0,"sha256":"809c7e46ad45359fd3d79041655131ffd251b4c183d2e3c1578f5d7794f116a3","crc32c":"48b37771"},
{"name":"/bin/test","perms":0555,"ftype":"file","ino":1770961,"nlink":2,"uid":0,"gid":0,"size":15361,"blocks":32,"mtime":1444422928,"ctime":1444521101,"flags":0,"sha256":"e1fcd944f699f893184cf6bfc227e642d77081590eb81fdd6232f70cbf9a0ec1","crc32c":"5bbd70b0"},
-{"name":"/etc","perms":0755,"ftype":"dir","ino":1053952,"nlink":28,"uid":0,"gid":0,"size":2048,"blocks":4,"mtime":1444589979,"ctime":1444589979,"flags":0},
+{"name":"/etc","perms":0755,"ftype":"dir","ino":1053952,"nlink":28,"uid":0,"gid":0,"size":2048,"blocks":4,"mtime":1447959152,"ctime":1447959152,"flags":0},
{"name":"/etc/X11","perms":0755,"ftype":"dir","ino":1053957,"nlink":12,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1441668277,"ctime":1444521112,"flags":0},
{"name":"/etc/X11/ctwm","perms":0755,"ftype":"dir","ino":1054927,"nlink":2,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1444521172,"ctime":1444521172,"flags":0},
{"name":"/etc/X11/ctwm/system.ctwmrc","perms":0444,"ftype":"file","ino":1054390,"nlink":1,"uid":0,"gid":0,"size":4823,"blocks":12,"mtime":1442705969,"ctime":1444521172,"flags":0,"sha256":"d0b131ec8c9d068958988f39af1d9f15fbc370514660efc5cd325780ae030327","crc32c":"1510361"},
@@ -206,7 +206,7 @@
{"name":"/etc/mailer.conf","perms":0644,"ftype":"file","ino":1054015,"nlink":1,"uid":0,"gid":0,"size":921,"blocks":4,"mtime":1385781121,"ctime":1385797726,"flags":0,"sha256":"2aab917aa543f00a223c092f18101cf4a63bc4ad88de1b32148411a3dfd1a2d5","crc32c":"6cf2fee0"},
{"name":"/etc/man.conf","perms":0644,"ftype":"file","ino":1054016,"nlink":1,"uid":0,"gid":0,"size":2159,"blocks":8,"mtime":1387675108,"ctime":1400349239,"flags":0,"sha256":"69f5dbf7a497c53dbba5a1bda599153e05144a035fa54f7e2db173315e7fda28","crc32c":"e4b91860"},
{"name":"/etc/master.passwd","perms":0600,"ftype":"file","ino":1054931,"nlink":1,"uid":0,"gid":0,"size":1778,"blocks":4,"mtime":1441823112,"ctime":1441823112,"flags":0,"crc32c":"0"},
-{"name":"/etc/mk.conf","perms":0644,"ftype":"file","ino":1054185,"nlink":1,"uid":0,"gid":0,"size":556,"blocks":4,"mtime":1415558007,"ctime":1415558007,"flags":0,"sha256":"a054b8b948b06fc48a0e0db6443ec1c7986cfc86c371e4a2b1f5b220062a9af2","crc32c":"84c8ffe6"},
+{"name":"/etc/mk.conf","perms":0644,"ftype":"file","ino":1054185,"nlink":1,"uid":0,"gid":0,"size":590,"blocks":4,"mtime":1447727556,"ctime":1447727556,"flags":0,"sha256":"72610359af357d0b7bbc067134889e9d1ef961e8ab161d6a9145b52642615a7f","crc32c":"c6ad2d17"},
{"name":"/etc/moduli","perms":0444,"ftype":"file","ino":1054018,"nlink":1,"uid":0,"gid":0,"size":111951,"blocks":220,"mtime":1430598448,"ctime":1430703886,"flags":0,"sha256":"32d267f22d7cd1a6d96394abe961b2a03cd562fef9e2f7119eec7492bddc902f","crc32c":"543a66c0"},
{"name":"/etc/monthly","perms":0644,"ftype":"file","ino":1054019,"nlink":1,"uid":0,"gid":0,"size":811,"blocks":4,"mtime":1385781121,"ctime":1385797726,"flags":0,"sha256":"4b05d951bb6fab4b98d5f1514df55368b2ac6d55fcdf7b48b5b55068efe69306","crc32c":"af074e40"},
{"name":"/etc/monthly.conf","perms":0644,"ftype":"file","ino":1054020,"nlink":1,"uid":0,"gid":0,"size":216,"blocks":4,"mtime":1385781121,"ctime":1385797726,"flags":0,"sha256":"a2d9e5ef62f875e254b2c47bfd09154f7b1aabcced0d77c451cfc6fe7ecd6fcf","crc32c":"2ea65981"},
@@ -754,7 +754,7 @@
{"name":"/etc/security","perms":0644,"ftype":"file","ino":1054048,"nlink":1,"uid":0,"gid":0,"size":28598,"blocks":56,"mtime":1430598447,"ctime":1430703895,"flags":0,"sha256":"81c0790dd177b1026b4a94ccd425b0dec2eb5f432d629b4e582cad471f26682f","crc32c":"30b702b8"},
{"name":"/etc/security.conf","perms":0644,"ftype":"file","ino":1054049,"nlink":1,"uid":0,"gid":0,"size":220,"blocks":4,"mtime":1385781122,"ctime":1385797726,"flags":0,"sha256":"5a8556e81e3e108f134d1dd8a2564ac7d44487f55a914be73a3311f6b8699408","crc32c":"d1cfc4b6"},
{"name":"/etc/services","perms":0644,"ftype":"file","ino":1054050,"nlink":1,"uid":0,"gid":0,"size":2784455,"blocks":5472,"mtime":1406607948,"ctime":1406686145,"flags":0,"sha256":"b7aa6484079a20347dd4db1eac4a21255ddf09dfadd5934677e446d7eb40f7bf","crc32c":"1e2f563e"},
-{"name":"/etc/shells","perms":0644,"ftype":"file","ino":1054051,"nlink":1,"uid":0,"gid":0,"size":236,"blocks":4,"mtime":1444527182,"ctime":1444527182,"flags":0,"sha256":"efc7f0ac9acbf2a4c1b9dfb082d4486d771363fb3f575fed0c96268d646a7bbb","crc32c":"b9972756"},
+{"name":"/etc/shells","perms":0644,"ftype":"file","ino":1054051,"nlink":1,"uid":0,"gid":0,"size":254,"blocks":4,"mtime":1447959152,"ctime":1447959152,"flags":0,"sha256":"f4fa65f401bd6dd3bdc3ee9b1c911d509e7b01cda79175fe25e704e274437a3a","crc32c":"79a2aaa7"},
{"name":"/etc/shrc","perms":0644,"ftype":"file","ino":1054052,"nlink":1,"uid":0,"gid":0,"size":419,"blocks":4,"mtime":1385781122,"ctime":1385797726,"flags":0,"sha256":"0186b10b27fc96da85f7f74eae963df746c04659e64d74e71d4b8d4e59e3bd7f","crc32c":"d6fce6af"},
{"name":"/etc/skel","perms":0755,"ftype":"dir","ino":1076869,"nlink":2,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1442706159,"ctime":1444521112,"flags":0},
{"name":"/etc/skel/.cshrc","perms":0444,"ftype":"file","ino":1077002,"nlink":1,"uid":0,"gid":0,"size":1787,"blocks":4,"mtime":1385781123,"ctime":1385797726,"flags":0,"sha256":"aa6f5b8fa5e64f41a6da4ece49b97c3a910b86a782b8a8829174a3c4eb5aaec1","crc32c":"4e4b42f0"},
@@ -943,21 +943,21 @@
{"name":"/var/at/spool","perms":0700,"ftype":"dir","ino":1305988,"nlink":2,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
{"name":"/var/backups","perms":0755,"ftype":"dir","ino":1305989,"nlink":6,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
{"name":"/var/cache","perms":0755,"ftype":"dir","ino":1328904,"nlink":3,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1444526226,"ctime":1444526226,"flags":0},
-{"name":"/var/cache/fontconfig","perms":0755,"ftype":"dir","ino":1328905,"nlink":2,"uid":0,"gid":0,"size":1536,"blocks":4,"mtime":1444589979,"ctime":1444589979,"flags":0},
-{"name":"/var/cache/fontconfig/009b7f300ca26e8ef33590f6a1de9909-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328982,"nlink":1,"uid":0,"gid":0,"size":136,"blocks":4,"mtime":1444589979,"ctime":1444589979,"flags":0,"sha256":"98f1bb04f627cb64c923887fc3e2584ea9b6dfc8d9b5b7edd8ff39e05f9a8f4d","crc32c":"60ae8e90"},
+{"name":"/var/cache/fontconfig","perms":0755,"ftype":"dir","ino":1328905,"nlink":2,"uid":0,"gid":0,"size":1536,"blocks":4,"mtime":1447727514,"ctime":1447727514,"flags":0},
+{"name":"/var/cache/fontconfig/009b7f300ca26e8ef33590f6a1de9909-x86_64.cache-4","perms":0644,"ftype":"file","ino":1330330,"nlink":1,"uid":0,"gid":0,"size":136,"blocks":4,"mtime":1447727514,"ctime":1447727514,"flags":0,"sha256":"98f1bb04f627cb64c923887fc3e2584ea9b6dfc8d9b5b7edd8ff39e05f9a8f4d","crc32c":"60ae8e90"},
{"name":"/var/cache/fontconfig/0121dbff3f41c8dc128af9cad23f6b48-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328950,"nlink":1,"uid":0,"gid":0,"size":213952,"blocks":480,"mtime":1416372469,"ctime":1416372469,"flags":0,"sha256":"6bedf34e2591423c4e6fce8590e45c1a74246d352a3bfdc9d5198ea52d768377","crc32c":"4b735220"},
-{"name":"/var/cache/fontconfig/2643cf6afbfb317cb17c1d21dc458165-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328978,"nlink":1,"uid":0,"gid":0,"size":184,"blocks":4,"mtime":1444589979,"ctime":1444589979,"flags":0,"sha256":"4cc576fcc63c782d5b0f87f7b16f25c9840850b4e198712c6a8cde737664222c","crc32c":"bcc903e"},
+{"name":"/var/cache/fontconfig/2643cf6afbfb317cb17c1d21dc458165-x86_64.cache-4","perms":0644,"ftype":"file","ino":1330327,"nlink":1,"uid":0,"gid":0,"size":184,"blocks":4,"mtime":1447727514,"ctime":1447727514,"flags":0,"sha256":"4cc576fcc63c782d5b0f87f7b16f25c9840850b4e198712c6a8cde737664222c","crc32c":"bcc903e"},
{"name":"/var/cache/fontconfig/2d94194ce4d2990a3f843ef78061beca-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328980,"nlink":1,"uid":0,"gid":0,"size":104,"blocks":4,"mtime":1444521324,"ctime":1444521324,"flags":0,"sha256":"422afd3a0b54114512782b80e9086e15c09f29970dfff43941e0cdc1bf25be4d","crc32c":"d6ab1ad7"},
{"name":"/var/cache/fontconfig/4465c0fef1910c30b8b07a31cf0d556b-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328951,"nlink":1,"uid":0,"gid":0,"size":30992,"blocks":64,"mtime":1444521323,"ctime":1444521323,"flags":0,"sha256":"059e812babf81f27b9ef3436c95bd46b5592cd7535194a60205d8964bcbd40d3","crc32c":"d786513f"},
{"name":"/var/cache/fontconfig/55b2cac89dddc12cd56404562208bc65-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328947,"nlink":1,"uid":0,"gid":0,"size":471016,"blocks":960,"mtime":1444521323,"ctime":1444521323,"flags":0,"sha256":"8e122a5d3767116ae85d0cb8062f0f2c8a35b49fa6976ae2b3806ad964545e22","crc32c":"40ebc2f8"},
{"name":"/var/cache/fontconfig/6f6f14cfa6264ffa51bf9370d9d5283f-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328946,"nlink":1,"uid":0,"gid":0,"size":93872,"blocks":184,"mtime":1444521324,"ctime":1444521324,"flags":0,"sha256":"4feacadc49ed3ecbc40d2da475079fd38cbd33afcb8b0135216308625877b4fa","crc32c":"c7ffdf7f"},
{"name":"/var/cache/fontconfig/70a20091e0d2f9c486945ad705521232-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328985,"nlink":1,"uid":0,"gid":0,"size":104,"blocks":4,"mtime":1437590588,"ctime":1437590588,"flags":0,"sha256":"f4895b927e2d30b6cc10ee10f5e761fa253f21684f38d57ec53861b7d76c6ea5","crc32c":"de5c7198"},
{"name":"/var/cache/fontconfig/74d456dc799749b082edc218b0d0c280-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328981,"nlink":1,"uid":0,"gid":0,"size":31856,"blocks":64,"mtime":1444521324,"ctime":1444521324,"flags":0,"sha256":"5953f1e1639004e32533b93bf0bf2f17e2f9c867b10846c98653bf6478a0f4b6","crc32c":"f0113a37"},
-{"name":"/var/cache/fontconfig/89a4d558674138dc24420905a5fd711a-x86_64.cache-4","perms":0644,"ftype":"file","ino":1332709,"nlink":1,"uid":0,"gid":0,"size":168,"blocks":4,"mtime":1444589979,"ctime":1444589979,"flags":0,"sha256":"7956d3d09ef4d08ecc558939674a4d8ff008b7436f27c428ebe67537e2fc8418","crc32c":"41c817a2"},
-{"name":"/var/cache/fontconfig/CACHEDIR.TAG","perms":0644,"ftype":"file","ino":1328952,"nlink":1,"uid":0,"gid":0,"size":200,"blocks":4,"mtime":1444589979,"ctime":1444589979,"flags":0,"sha256":"05e7633fb31bf1f6f8d89020c16b9f24587fdf7638e951c9745b192f5fc3b682","crc32c":"1666ad7d"},
+{"name":"/var/cache/fontconfig/89a4d558674138dc24420905a5fd711a-x86_64.cache-4","perms":0644,"ftype":"file","ino":1330329,"nlink":1,"uid":0,"gid":0,"size":168,"blocks":4,"mtime":1447727514,"ctime":1447727514,"flags":0,"sha256":"7956d3d09ef4d08ecc558939674a4d8ff008b7436f27c428ebe67537e2fc8418","crc32c":"41c817a2"},
+{"name":"/var/cache/fontconfig/CACHEDIR.TAG","perms":0644,"ftype":"file","ino":1328982,"nlink":1,"uid":0,"gid":0,"size":200,"blocks":4,"mtime":1447727514,"ctime":1447727514,"flags":0,"sha256":"05e7633fb31bf1f6f8d89020c16b9f24587fdf7638e951c9745b192f5fc3b682","crc32c":"1666ad7d"},
{"name":"/var/cache/fontconfig/a9dea77e1bc544d8a0f33b571846656f-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328948,"nlink":1,"uid":0,"gid":0,"size":104,"blocks":4,"mtime":1437590588,"ctime":1437590588,"flags":0,"sha256":"150d4b522331226ac50e567e7fa582bb25e73823f15df8a71f2b2185c087f7e1","crc32c":"e8e318e0"},
{"name":"/var/cache/fontconfig/aa1e70252596ea83d279605d9218ef3c-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328989,"nlink":1,"uid":0,"gid":0,"size":104,"blocks":4,"mtime":1437590588,"ctime":1437590588,"flags":0,"sha256":"592df9550160e6e152ec15524049e42310fa3a9e5627abf26fcacee5aaed5ff9","crc32c":"23fa6505"},
-{"name":"/var/cache/fontconfig/c344bc92bb46464cf03d13a89200d20c-x86_64.cache-4","perms":0644,"ftype":"file","ino":1332710,"nlink":1,"uid":0,"gid":0,"size":560,"blocks":4,"mtime":1444589979,"ctime":1444589979,"flags":0,"sha256":"1302c8204cbc2ec914477c27cc735a7f3205aa9c105d891b47bc95445d22741a","crc32c":"56e8a112"},
+{"name":"/var/cache/fontconfig/c344bc92bb46464cf03d13a89200d20c-x86_64.cache-4","perms":0644,"ftype":"file","ino":1330328,"nlink":1,"uid":0,"gid":0,"size":560,"blocks":4,"mtime":1447727514,"ctime":1447727514,"flags":0,"sha256":"1302c8204cbc2ec914477c27cc735a7f3205aa9c105d891b47bc95445d22741a","crc32c":"56e8a112"},
{"name":"/var/cache/fontconfig/c94fc4589f4e4f179bb7abc5ef634560-x86_64.cache-4","perms":0644,"ftype":"file","ino":1329691,"nlink":1,"uid":0,"gid":0,"size":43856,"blocks":88,"mtime":1411100030,"ctime":1411100030,"flags":0,"sha256":"1e5343beeb5bf44757f2c2e9c7f5744798b0ccd3a58e7715de3e1eb6dde60009","crc32c":"ef10766e"},
{"name":"/var/cache/fontconfig/d3ee437f1f636fc64dd0708e2f86151e-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328984,"nlink":1,"uid":0,"gid":0,"size":112,"blocks":4,"mtime":1444521324,"ctime":1444521324,"flags":0,"sha256":"42039fea7db6ffaf4abd5e908830c2cbd8f31ca0be3b4c5411dc5d630dfa2d6e","crc32c":"5c547a0c"},
{"name":"/var/cache/fontconfig/e517d87a9804ced65dd9c23533dd0dec-x86_64.cache-4","perms":0644,"ftype":"file","ino":1328983,"nlink":1,"uid":0,"gid":0,"size":471736,"blocks":960,"mtime":1444521321,"ctime":1444521321,"flags":0,"sha256":"cad5d6b2d522d7e0d722c237ecc6b7552a300c514d2378401a7e012dc4191d63","crc32c":"b004fa33"},
@@ -966,11 +966,14 @@
{"name":"/var/crash/minfree","perms":0600,"ftype":"file","ino":1306071,"nlink":1,"uid":0,"gid":0,"size":5,"blocks":4,"mtime":1385781121,"ctime":1385797726,"flags":0,"crc32c":"0"},
{"name":"/var/cron","perms":0755,"ftype":"dir","ino":1306019,"nlink":3,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
{"name":"/var/cron/tabs","perms":0700,"ftype":"dir","ino":1306020,"nlink":2,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1442706157,"ctime":1444521112,"flags":0},
-{"name":"/var/games","perms":0775,"ftype":"dir","ino":1306036,"nlink":6,"uid":7,"gid":13,"size":512,"blocks":4,"mtime":1435953540,"ctime":1444521112,"flags":0},
+{"name":"/var/games","perms":0775,"ftype":"dir","ino":1306036,"nlink":7,"uid":7,"gid":13,"size":512,"blocks":4,"mtime":1446768384,"ctime":1446768384,"flags":0},
{"name":"/var/games/atc_score","perms":0664,"ftype":"file","ino":1306074,"nlink":1,"uid":7,"gid":13,"size":0,"blocks":0,"mtime":1383877776,"ctime":1385797726,"flags":0,"sha256":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","crc32c":"0"},
{"name":"/var/games/battlestar.log","perms":0664,"ftype":"file","ino":1306075,"nlink":1,"uid":7,"gid":13,"size":0,"blocks":0,"mtime":1383877776,"ctime":1385797726,"flags":0,"sha256":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","crc32c":"0"},
{"name":"/var/games/cfscores","perms":0664,"ftype":"file","ino":1306076,"nlink":1,"uid":7,"gid":13,"size":0,"blocks":0,"mtime":1383877776,"ctime":1385797726,"flags":0,"sha256":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","crc32c":"0"},
{"name":"/var/games/criblog","perms":0664,"ftype":"file","ino":1306077,"nlink":1,"uid":7,"gid":13,"size":0,"blocks":0,"mtime":1383877776,"ctime":1385797726,"flags":0,"sha256":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","crc32c":"0"},
+{"name":"/var/games/emacs","perms":0775,"ftype":"dir","ino":1332205,"nlink":2,"uid":7,"gid":13,"size":512,"blocks":4,"mtime":1446768386,"ctime":1446768386,"flags":0},
+{"name":"/var/games/emacs/snake-scores","perms":0664,"ftype":"file","ino":1332210,"nlink":1,"uid":7,"gid":13,"size":0,"blocks":0,"mtime":1446768386,"ctime":1446768386,"flags":0,"sha256":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","crc32c":"0"},
+{"name":"/var/games/emacs/tetris-scores","perms":0664,"ftype":"file","ino":1332211,"nlink":1,"uid":7,"gid":13,"size":0,"blocks":0,"mtime":1446768386,"ctime":1446768386,"flags":0,"sha256":"e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855","crc32c":"0"},
{"name":"/var/games/hackdir","perms":0775,"ftype":"dir","ino":1306037,"nlink":3,"uid":7,"gid":13,"size":512,"blocks":4,"mtime":1444521150,"ctime":1444521150,"flags":0},
{"name":"/var/games/hackdir/data","perms":0444,"ftype":"file","ino":1307619,"nlink":1,"uid":0,"gid":13,"size":9801,"blocks":20,"mtime":1442705992,"ctime":1444521150,"flags":0,"sha256":"efdd3e44da06a3e1eaef6822baea33f79bae2ff9fc8beec333d8db1279b3321c","crc32c":"38d9b8bb"},
{"name":"/var/games/hackdir/help","perms":0444,"ftype":"file","ino":1307620,"nlink":1,"uid":0,"gid":13,"size":5136,"blocks":12,"mtime":1442705992,"ctime":1444521150,"flags":0,"sha256":"b719632f99a32d01ad3dfab41026509fc607ce74b44db86c6277a3218071e58d","crc32c":"f15f8c2d"},
@@ -1002,7 +1005,7 @@
{"name":"/var/preserve","perms":0755,"ftype":"dir","ino":1306047,"nlink":2,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
{"name":"/var/quotas","perms":0750,"ftype":"dir","ino":1306048,"nlink":2,"uid":0,"gid":5,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
{"name":"/var/rwho","perms":0755,"ftype":"dir","ino":1306052,"nlink":2,"uid":19,"gid":19,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
-{"name":"/var/shm","perms":1777,"ftype":"dir","ino":85401585303072822,"nlink":2,"uid":0,"gid":0,"size":0,"blocks":0,"mtime":1444589978,"ctime":1444589978,"flags":0},
+{"name":"/var/shm","perms":1777,"ftype":"dir","ino":85401585302706003,"nlink":2,"uid":0,"gid":0,"size":0,"blocks":0,"mtime":1447727514,"ctime":1447727514,"flags":0},
{"name":"/var/tmp","perms":1777,"ino":1306064,"nlink":3,"uid":0,"gid":0,"size":512,"blocks":4,"flags":0},
{"name":"/var/tpm","perms":0750,"ftype":"dir","ino":1306066,"nlink":2,"uid":28,"gid":28,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
{"name":"/var/www","perms":0755,"ftype":"dir","ino":1306067,"nlink":2,"uid":0,"gid":0,"size":512,"blocks":4,"mtime":1435946550,"ctime":1444521112,"flags":0},
Index: othersrc/external/bsd/sid/dist/sid.c
diff -u othersrc/external/bsd/sid/dist/sid.c:1.3 othersrc/external/bsd/sid/dist/sid.c:1.4
--- othersrc/external/bsd/sid/dist/sid.c:1.3 Thu Nov 12 21:01:29 2015
+++ othersrc/external/bsd/sid/dist/sid.c Fri Nov 20 22:26:16 2015
@@ -151,6 +151,7 @@ digestable(struct stat *st)
return ((st->st_mode & S_IFMT) == S_IFREG);
}
+/* read file into memory */
static int
readfile(const char *name, char **f, size_t *size)
{
@@ -184,6 +185,26 @@ readfile(const char *name, char **f, siz
return 1;
}
+/* grow an array, if necessary */
+static int
+growarray(void *p, size_t elsize, uint32_t c, uint32_t *size, uint32_t incr)
+{
+ void **array = (void **)p;
+ void *newv;
+
+ if (c == *size) {
+ newv = realloc(*array, (*size + incr) * elsize);
+ if (newv == NULL) {
+ warn("growarray: allocation %zu bytes",
+ (*size * incr) * elsize);
+ return 0;
+ }
+ *array = newv;
+ *size += incr;
+ }
+ return 1;
+}
+
/* check the directory entry */
static int
checkentry(sid_t *sid, const char *prefix, const char *f, const char *origcheck)
@@ -197,7 +218,6 @@ checkentry(sid_t *sid, const char *prefi
uint32_t i;
ssize_t cc;
size_t outc;
- char **newv;
char newf[1024];
char path[1024];
char out[2048];
@@ -336,15 +356,8 @@ checkentry(sid_t *sid, const char *prefi
cp += 1;
}
}
- if (sid->outc == sid->outmax) {
- newv = realloc(sid->outs,
- ((sid->outmax + 120) * sizeof(*sid->outs)));
- if (newv == NULL) {
- warn("can't realloc outs %u entries", sid->outc);
- return 0;
- }
- sid->outs = newv;
- sid->outmax += 120;
+ if (!growarray(&sid->outs, sizeof(*sid->outs), sid->outc, &sid->outmax, 120)) {
+ return 0;
}
outc += snprintf(&out[outc], sizeof(out) - outc, "}");
sid->outs[sid->outc++] = strnsave(out, outc);
@@ -470,7 +483,6 @@ sid_readconf(sid_t *sid, const char *con
regex_t rule;
regex_t ign;
regex_t chk;
- pair_t *pair;
FILE *fp;
char buf[BUFSIZ];
@@ -490,25 +502,19 @@ sid_readconf(sid_t *sid, const char *con
buf[m[0].rm_so] = 0x0;
}
if (regexec(&rule, buf, 10, m, 0) == 0) {
- pair = realloc(sid->rules,
- ((sid->rulec + 1) * sizeof(*sid->rules)));
- if (pair == NULL) {
- warn("newpair failure %u rules", sid->rulec);
+ if (!growarray(&sid->rules, sizeof(*sid->rules),
+ sid->rulec, &sid->rulec, 1)) {
return 0;
}
- sid->rules = pair;
- newpair(&sid->rules[sid->rulec++],
+ newpair(&sid->rules[sid->rulec - 1],
&buf[m[1].rm_so], m[1].rm_eo - m[1].rm_so,
&buf[m[2].rm_so], m[2].rm_eo - m[2].rm_so);
} else if (regexec(&ign, buf, 10, m, 0) == 0) {
- pair = realloc(sid->ignores,
- ((sid->ignorec + 1) * sizeof(*sid->ignores)));
- if (pair == NULL) {
- warn("realloc failure %u ignores", sid->ignorec);
+ if (!growarray(&sid->ignores, sizeof(*sid->ignores),
+ sid->ignorec, &sid->ignorec, 1)) {
return 0;
}
- sid->ignores = pair;
- newpair(&sid->ignores[sid->ignorec++],
+ newpair(&sid->ignores[sid->ignorec - 1],
&buf[m[1].rm_so], m[1].rm_eo - m[1].rm_so,
"", 0);
} else if (regexec(&chk, buf, 10, m, 0) == 0) {
Index: othersrc/external/bsd/sid/dist/sid.h
diff -u othersrc/external/bsd/sid/dist/sid.h:1.3 othersrc/external/bsd/sid/dist/sid.h:1.4
--- othersrc/external/bsd/sid/dist/sid.h:1.3 Thu Nov 12 21:22:18 2015
+++ othersrc/external/bsd/sid/dist/sid.h Fri Nov 20 22:26:16 2015
@@ -23,9 +23,9 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#ifndef SID_H_
-#define SID_H_ 20151014
+#define SID_H_ 20151120
-#define SID_VERSION "20151014"
+#define SID_VERSION "20151120"
struct sid_t;
