X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command_util.sh;h=a735d3c247204ff409804594446a38c3071a0d24;hp=62a406c72778bf10cd7f7889b288a9a786448a7f;hb=b6100d88b5a03e824991b4a5bfd90b0e951e8d2b;hpb=03273d73589ffd1bd34ae2c25bdb66c6ae44fa64

diff --git a/command_util.sh b/command_util.sh
index 62a406c7..a735d3c2 100755
--- a/command_util.sh
+++ b/command_util.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
 read_header()
@@ -26,6 +26,12 @@ read_header()
 		AT:)
 			array_type="$value"
 			;;
+		SI:)
+			for i in $value; do
+				system_includes="$system_includes
+#include <$i.h>"
+			done
+			;;
 		IN:)
 			for i in $value; do
 				includes="$includes
@@ -148,7 +154,7 @@ dump_man()
 			local t_name_txt=$(echo $name_txt | $sed_cmd)
 			echo ".SS \"$t_name_txt\""
 		done
-		echo "$desc_txt"
+		echo "$desc_txt" | sed -e "s/@member@/{$(echo $template_members | sed -e 's/ / | /g')}/g"
 		echo
 		echo "\\fBUsage: \\fP"
 		echo
@@ -161,7 +167,7 @@ dump_man()
 		echo ".fi"
 	fi
 	echo
-	echo "$help_txt"
+	echo "$help_txt" | sed -e 's/^	//'
 	echo
 	if test -n "$perms_txt"; then
 		echo -n "\\fBpermissions:\\fP "
@@ -198,7 +204,11 @@ dump_proto()
 	echo '/**'
 	echo " * $desc_txt"
 	echo ' *'
-	echo ' * \param fd The file descriptor to send output to.'
+	if [[ "$system_includes" =~ openssl/rc4.h ]]; then
+		echo ' * \param rc4c The rc4 crypt context.'
+	else
+		echo ' * \param fd The file descriptor to send output to.'
+	fi
 	if test $line_handler -eq 0; then
 		echo ' * \param argc The number of arguments.'
 		echo ' * \param argv The argument vector.'
@@ -241,7 +251,7 @@ dump_array_member()
 	echo ".description = \"$desc_txt\","
 	echo ".usage = \"$usage_txt\","
 	echo ".help = "
-	echo "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g'
+	printf "%s\n" "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g'
 	echo '},'
 }
 
@@ -263,7 +273,7 @@ template_loop()
 		perms_txt=$(echo $t_perms | $sed_cmd)
 		desc_txt=$(echo $t_desc | $sed_cmd)
 		usage_txt=$(echo $t_usage | $sed_cmd)
-		help_txt=$(echo $t_help | $sed_cmd)
+		help_txt=$(printf "%s\n" "$t_help" | $sed_cmd)
 		prototype=$(echo "$template_prototype" | $sed_cmd)
 		$1
 	done
@@ -273,6 +283,7 @@ template_loop()
 com_c_file()
 {
 	echo "/** \file $output_file.c $c_file_comment */"
+	echo "$system_includes"
 	echo "$includes"
 	echo "struct $array_type $array_name[] = {"
 	while : ; do