X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Fcopying.awk;h=1cd596a56411ae56b29b2b8ef26c1386350b8796;hb=319ff62c8ab28c846365aef65c137735f8af88cb;hp=378d62031ec2bd27fd4ed2a18b4b044eb66d2de6;hpb=3c0c9328b9c299580bcf8cb6fdb3b71d5a0525ff;p=deliverable%2Fbinutils-gdb.git

diff --git a/gdb/copying.awk b/gdb/copying.awk
index 378d62031e..1cd596a564 100644
--- a/gdb/copying.awk
+++ b/gdb/copying.awk
@@ -1,17 +1,29 @@
 BEGIN	{
 	  FS="\"";
-	  print "/* Do not modify this file; it is created automatically";
-	  print "   by copying.awk.  */";
+	  print "/* ==> Do not modify this file!!  " \
+		"-*- buffer-read-only: t -*- vi" \
+		":set ro:";
+	  print "   It is created automatically by copying.awk.";
+	  print "   Modify copying.awk instead.  <== */";
+	  print ""
 	  print "#include \"defs.h\""
 	  print "#include \"command.h\""
-	  print "extern int immediate_quit;";
+	  print "#include \"gdbcmd.h\""
+	  print ""
+	  print "static void show_copying_command (const char *, int);"
+	  print ""
+	  print "static void show_warranty_command (const char *, int);"
+	  print ""
 	  print "static void";
-	  print "copying_info ()";
+	  print "show_copying_command (const 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++)
@@ -19,16 +31,14 @@ NR == 1,/^[ 	]*NO WARRANTY[ 	]*$/	{
 	      printf "%s\\n\");\n", $NF;
 	    }
 	}
-/^[	 ]*NO WARRANTY[ 	]*$/	{
-	  print "  immediate_quit--;";
+/^[	 ]*15\. Disclaimer of Warranty\.[ 	]*$/	{
 	  print "}";
 	  print "";
 	  print "static void";
-	  print "warranty_info ()";
+	  print "show_warranty_command (const 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 (\"";
@@ -38,18 +48,22 @@ NR == 1,/^[ 	]*NO WARRANTY[ 	]*$/	{
 	    }
 	}
 END	{
-	  print "  immediate_quit--;";
 	  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_set_class, show_copying_command,";
+	  print "	   _(\"Conditions for redistributing copies of GDB.\"),";
+	  print "	   &showlist);";
+	  print "  add_cmd (\"warranty\", no_set_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 "}";
 	}
-
-
-