X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command_util.sh;h=a735d3c247204ff409804594446a38c3071a0d24;hp=f0a861d61d887b5e68b9e90e9b9cfa512c23b9b6;hb=c00d7e25de7006d6f88aafb2b485057377a70324;hpb=b98061f27df8d44d1b83b842a46d94f4fe68862d

diff --git a/command_util.sh b/command_util.sh
index f0a861d6..a735d3c2 100755
--- a/command_util.sh
+++ b/command_util.sh
@@ -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
@@ -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.'
@@ -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=$(printf "%s" "$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