X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcopying.awk;h=936f435c98e1edea3ede0123ac86d01e4d854ce2;hb=d45b7d7459ca767cf1a3b025190ab95c3b13542d;hp=a93631846273331c89b7d0c3a614e86059a5a62c;hpb=4187119d59afd156703cfcbc6be287c5085f1867;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/copying.awk b/gdb/copying.awk
index a936318462..936f435c98 100644
--- a/gdb/copying.awk
+++ b/gdb/copying.awk
@@ -1,15 +1,30 @@
 BEGIN	{
 	  FS="\"";
-	  print "/* Do not modify this file; it is created automatically";
-	  print "   by copying.awk.  */";
+	  print "/* ==> Do not modify this file!!  It is created automatically";
+	  print "   by copying.awk.  Modify copying.awk instead.  <== */";
+	  print ""
+	  print "#include \"defs.h\""
+	  print "#include \"command.h\""
+	  print "#include \"gdbcmd.h\""
+	  print ""
+	  print "static void show_copying_command (char *, int);"
+	  print ""
+	  print "static void show_warranty_command (char *, int);"
+	  print ""
+	  print "void _initialize_copying (void);"
+	  print ""
 	  print "extern int immediate_quit;";
 	  print "static void";
-	  print "copying_info ()";
+	  print "show_copying_command (char *ignore, int from_tty)";
 	  print "{";
 	  print "  immediate_quit++;";
 	}
-NR == 1,/^[ 	]*NO WARRANTY[ 	]*$/	{
-	  if (! ($0 ~ /^[ 	]*NO WARRANTY[ 	]*$/)) 
+NR == 1,/^[ 	]*15\. Disclaimer of Warranty\.[ 	]*$/	{
+	  if ($0 ~ //)
+	    {
+	      printf "  printf_filtered (\"\\n\");\n";
+	    }
+	  else if ($0 !~ /^[ 	]*15\. Disclaimer of Warranty\.[ 	]*$/) 
 	    {
 	      printf "  printf_filtered (\"";
 	      for (i = 1; i < NF; i++)
@@ -17,16 +32,16 @@ NR == 1,/^[ 	]*NO WARRANTY[ 	]*$/	{
 	      printf "%s\\n\");\n", $NF;
 	    }
 	}
-/^[	 ]*NO WARRANTY[ 	]*$/	{
+/^[	 ]*15\. Disclaimer of Warranty\.[ 	]*$/	{
 	  print "  immediate_quit--;";
 	  print "}";
 	  print "";
 	  print "static void";
-	  print "warranty_info ()";
+	  print "show_warranty_command (char *ignore, int from_tty)";
 	  print "{";
 	  print "  immediate_quit++;";
 	}
-/^[ 	]*NO WARRANTY[ 	]*$/, /^[ 	]*END OF TERMS AND CONDITIONS[ 	]*$/{  
+/^[ 	]*15\. Disclaimer of Warranty\.[ 	]*$/, /^[ 	]*END OF TERMS AND CONDITIONS[ 	]*$/{  
 	  if (! ($0 ~ /^[ 	]*END OF TERMS AND CONDITIONS[ 	]*$/)) 
 	    {
 	      printf "  printf_filtered (\"";
@@ -40,14 +55,19 @@ END	{
 	  print "}";
 	  print "";
 	  print "void"
-	  print "_initialize_copying ()";
+	  print "_initialize_copying (void)";
 	  print "{";
-	  print "  add_info (\"copying\", copying_info,";
-	  print "	    \"Conditions for redistributing copies of GDB.\");";
-	  print "  add_info (\"warranty\", warranty_info,";
-	  print "	  \"Various kinds of warranty you do not have.\");";
+	  print "  add_cmd (\"copying\", no_class, show_copying_command,";
+	  print "	   _(\"Conditions for redistributing copies of GDB.\"),";
+	  print "	   &showlist);";
+	  print "  add_cmd (\"warranty\", no_class, show_warranty_command,";
+	  print "	   _(\"Various kinds of warranty you do not have.\"),";
+	  print "	   &showlist);";
+	  print "";
+	  print "  /* For old-timers, allow \"info copying\", etc.  */";
+	  print "  add_info (\"copying\", show_copying_command,";
+	  print "	    _(\"Conditions for redistributing copies of GDB.\"));";
+	  print "  add_info (\"warranty\", show_warranty_command,";
+	  print "	    _(\"Various kinds of warranty you do not have.\"));";
 	  print "}";
 	}
-
-
-