1 files changed, 21 insertions, 14 deletions

diff --git a/other/analysis/gen-file.sh b/other/analysis/gen-file.sh
index 019bd8f9..ad8df3b8 100644
--- a/other/analysis/gen-file.sh
+++ b/other/analysis/gen-file.sh
@@ -17,20 +17,20 @@ put() {
   if [ "$SKIP_LINES" = "" ]; then
     echo "#line 1 \"$1\"" >> amalgamation.cc
   fi
-  cat $1 >> amalgamation.cc
+  cat "$1" >> amalgamation.cc
 }
 
 putmain() {
-  echo "namespace $(echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g') {" >> amalgamation.cc
+  echo "namespace $(echo "$1" | sed -e 's/[^a-zA-Z0-9_]/_/g') {" >> amalgamation.cc
   if [ "$SKIP_LINES" = "" ]; then
     echo "#line 1 \"$1\"" >> amalgamation.cc
   fi
-  sed -e 's/^int main(/static &/' $1 >> amalgamation.cc
-  echo "} //  namespace $(echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g')" >> amalgamation.cc
+  sed -e 's/^int main(/static &/' "$1" >> amalgamation.cc
+  echo "} //  namespace $(echo "$1" | sed -e 's/[^a-zA-Z0-9_]/_/g')" >> amalgamation.cc
 }
 
 callmain() {
-  echo "  call($(echo $1 | sed -e 's/[^a-zA-Z0-9_]/_/g')::main, argc, argv);" >> amalgamation.cc
+  echo "  call($(echo "$1" | sed -e 's/[^a-zA-Z0-9_]/_/g')::main, argc, argv);" >> amalgamation.cc
 }
 
 :> amalgamation.cc
@@ -53,25 +53,32 @@ FIND_QUERY="$FIND_QUERY -and -not -name av_test.c"
 FIND_QUERY="$FIND_QUERY -and -not -name dht_test.c"
 FIND_QUERY="$FIND_QUERY -and -not -name version_test.c"
 
-for i in $(eval $FIND_QUERY); do
-  if ! grep -q '^int main(' $i; then
-    put $i
+(for i in $(eval "$FIND_QUERY"); do
+  grep -o '#include <[^>]*>' "$i" \
+    | grep -E -v '<win|<ws|<iphlp|<libc|<mach/|<crypto_|<randombytes|<u.h>|<sys/filio|<linux'
+done) | sort -u >> amalgamation.cc
+
+echo 'namespace {' >> amalgamation.cc
+for i in $(eval "$FIND_QUERY"); do
+  if ! grep -q '^int main(' "$i"; then
+    put "$i"
   fi
 done
 
-for i in $(eval $FIND_QUERY); do
-  if grep -q '^int main(' $i; then
-    putmain $i
+for i in $(eval "$FIND_QUERY"); do
+  if grep -q '^int main(' "$i"; then
+    putmain "$i"
   fi
 done
 
 echo "static void call(int m(), int argc, char **argv) { m(); }" >> amalgamation.cc
 echo "static void call(int m(int, char **), int argc, char **argv) { m(argc, argv); }" >> amalgamation.cc
+echo '}  // namespace' >> amalgamation.cc
 
 echo "int main(int argc, char **argv) {" >> amalgamation.cc
-for i in $(eval $FIND_QUERY); do
-  if grep -q '^int main(' $i; then
-    callmain $i
+for i in $(eval "$FIND_QUERY"); do
+  if grep -q '^int main(' "$i"; then
+    callmain "$i"
   fi
 done
 echo "  return 0;" >> amalgamation.cc