X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=command_util.sh;h=a7f1b542a6532d0042af51e462ab264ee4f10e95;hp=4a9a03cc77f9637e20fc797d99f655ca3ce90a30;hb=337d7784b0f8bc30b1fa9af56ace503acd97d40d;hpb=0a405367cdc8f3b0f49fb5ec3798378a2fc4589b

diff --git a/command_util.sh b/command_util.sh
index 4a9a03cc..a7f1b542 100755
--- a/command_util.sh
+++ b/command_util.sh
@@ -1,26 +1,6 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
 
-dump_array_member()
-{
-	echo '{'
-	echo ".name = \"$name_txt\","
-	if test $line_handler -eq 0; then
-		echo ".handler = com_$name_txt,"
-	else
-		echo ".handler = NULL,"
-		echo ".line_handler = com_$name_txt,"
-	fi
-	if test -n "$perms_txt"; then
-		echo ".perms = $perms_txt,"
-	fi
-	echo ".description = \"$desc_txt\","
-	echo ".usage = \"$usage_txt\","
-	echo ".help = "
-	echo "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g'
-	echo '},'
-}
-
 read_header()
 {
 	local key value i
@@ -41,11 +21,17 @@ read_header()
 			array_name=${value%command_list}cmds
 			;;
 		SF:)
-			source_file="$value"
+			source_files="$value"
 			;;
 		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
@@ -56,6 +42,9 @@ read_header()
 			;;
 		SN:)
 			section_name="$value"
+			;;
+		TM:)
+			template_members="$value"
 		esac
 	done
 	if test -z "$header_comment" -o -z "$c_file_comment" \
@@ -75,6 +64,9 @@ read_one_command()
 	help_txt=""
 	perms_txt=""
 	line_handler=0
+	template=0
+	template_name=""
+	template_prototype=""
 	mkdir -p man/man1
 	while read key value; do
 		case "$key" in
@@ -84,6 +76,14 @@ read_one_command()
 		N:)
 			name_txt="$value"
 			;;
+		T:)
+			template_name="$value"
+			template=1
+			;;
+		O:)
+			template_prototype="$value"
+			template=1
+			;;
 		P:)
 			perms_txt="$value"
 			;;
@@ -110,10 +110,20 @@ ${line# }"
 			;;
 		esac
 	done
-	if test -n "$name_txt" -a -n "$desc_txt" -a -n "$usage_txt" \
-			-a -n "$help_txt"; then
-		ret=1
-		return
+	if test $template -eq 0; then
+		if test -n "$name_txt" -a -n "$desc_txt" -a -n "$usage_txt" \
+				-a -n "$help_txt"; then
+			ret=1
+			return
+		fi
+	else
+		if test -n "$template_name" -a -n "$template_prototype" \
+				-a -n "$name_txt " -a -n "$template_members" \
+				-a -n "$desc_txt" -a -n "$usage_txt" \
+				-a -n "$help_txt"; then
+			ret=1
+			return
+		fi
 	fi
 	if test -z "$name_txt" -a -z "$desc_txt" -a -z "$usage_txt" \
 			-a -z "$help_txt"; then
@@ -121,23 +131,43 @@ ${line# }"
 		return
 	fi
 	ret=-1
-	return
+	#return
 	echo "!ERROR!"
 	echo "N: $name_txt"
 	echo "D: $desc_txt"
 	echo "S: $usage_txt"
 	echo "P: $perms_txt"
 	echo "H: $help_txt"
+	echo "O: $template_prototype"
 }
 
 dump_man()
 {
-	echo ".SS \"$name_txt\""
-	echo "$desc_txt"
-	echo
-	echo "\\fBusage: \\fP$usage_txt"
+	if test $template -eq 0; then
+		echo ".SS \"$name_txt\""
+		echo "$desc_txt"
+		echo
+		echo "\\fBUsage: \\fP$usage_txt"
+	else
+		for member in $template_members; do
+			local sed_cmd="sed -e s/@member@/$member/g"
+			local t_name_txt=$(echo $name_txt | $sed_cmd)
+			echo ".SS \"$t_name_txt\""
+		done
+		echo "$desc_txt" | sed -e "s/@member@/{$(echo $template_members | sed -e 's/ / | /g')}/g"
+		echo
+		echo "\\fBUsage: \\fP"
+		echo
+		echo ".nf"
+		for member in $template_members; do
+			local sed_cmd="sed -e s/@member@/$member/g"
+			local t_usage_txt=$(echo $usage_txt | $sed_cmd)
+			printf "\t$t_usage_txt\n"
+		done
+		echo ".fi"
+	fi
 	echo
-	echo "$help_txt"
+	echo "$help_txt" | sed -e 's/^	//'
 	echo
 	if test -n "$perms_txt"; then
 		echo -n "\\fBpermissions:\\fP "
@@ -167,9 +197,89 @@ com_man()
 	done
 }
 
+dump_proto()
+{
+	local source_file match=""
+
+	echo '/**'
+	echo " * $desc_txt"
+	echo ' *'
+	echo ' * \param fd The file descriptor to send output to.'
+	if test $line_handler -eq 0; then
+		echo ' * \param argc The number of arguments.'
+		echo ' * \param argv The argument vector.'
+	else
+		echo ' * \param cmdline The full command line.'
+	fi
+	echo ' * '
+	echo " * Usage: $usage_txt"
+	echo ' * '
+	echo "$help_txt" | sed -e 's/^/ * /g'
+	echo ' */'
+	if test -n "$prototype"; then
+		echo "$prototype"
+		echo
+		return
+	fi
+	for source_file in $source_files; do
+		match=$(grep "^\(__noreturn \)*int com_$name_txt(" $source_file | head -n 1 | sed -e 's/$/;/1')
+		if test -n "$match"; then
+			echo "$match"
+			break
+		fi
+	done
+	echo
+}
+
+dump_array_member()
+{
+	echo '{'
+	echo ".name = \"$name_txt\","
+	if test $line_handler -eq 0; then
+		echo ".handler = com_$name_txt,"
+	else
+		echo ".handler = NULL,"
+		echo ".line_handler = com_$name_txt,"
+	fi
+	if test -n "$perms_txt"; then
+		echo ".perms = $perms_txt,"
+	fi
+	echo ".description = \"$desc_txt\","
+	echo ".usage = \"$usage_txt\","
+	echo ".help = "
+	printf "%s\n" "$help_txt" | sed -e 's/^/\"/g' -e 's/$/\\n\"/g'
+	echo '},'
+}
+
+
+template_loop()
+{
+	local t_name="$name_txt"
+	local t_perms="$perms_txt"
+	local t_desc="$desc_txt"
+	local t_usage="$usage_txt"
+	local t_help="$help_txt"
+	local t_source_files="$source_files"
+	local member
+	for member in $template_members; do
+		local sed_cmd="sed -e s/@member@/$member/g"
+		#echo "sed_cmd: $sed_cmd"
+		name_txt=$(echo $t_name | $sed_cmd)
+		#name_txt="$tname"
+		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\n" "$t_help" | $sed_cmd)
+		prototype=$(echo "$template_prototype" | $sed_cmd)
+		$1
+	done
+
+}
+
 com_c_file()
 {
 	echo "/** \file $output_file.c $c_file_comment */"
+	echo "$system_includes"
 	echo "$includes"
 	echo "struct $array_type $array_name[] = {"
 	while : ; do
@@ -180,32 +290,15 @@ com_c_file()
 		if test $ret -eq 0; then
 			break
 		fi
-		dump_array_member
+		if test $template -eq 0; then
+			dump_array_member
+			continue
+		fi
+		template_loop dump_array_member
 	done
 	echo '{.name = NULL}};'
 }
 
-dump_proto()
-{
-	echo '/**'
-	echo " * $desc_txt"
-	echo ' *'
-	echo ' * \param fd the file descriptor to send output to'
-	if test $line_handler -eq 0; then
-		echo ' * \param argc the number of arguments'
-		echo ' * \param argv the argument vector'
-	else
-		echo ' * \param cmdline the full command line'
-	fi
-	echo ' * '
-	echo " * usage: $usage_txt"
-	echo ' * '
-	echo "$help_txt" | sed -e 's/^/ * /g'
-	echo ' */'
-	grep "^\(__noreturn \)*int com_$name_txt(" $source_file | sed -e 's/$/;/1'
-	echo
-}
-
 com_header()
 {
 	echo "/** \file $output_file.h $header_comment */"
@@ -219,7 +312,11 @@ com_header()
 		if test $ret -eq 0; then
 			break
 		fi
-		dump_proto
+		if test $template -eq 0; then
+			dump_proto
+			continue
+		fi
+		template_loop dump_proto
 	done
 }