2002-12-26 Roland McGrath <roland@redhat.com>

	* syscallent.sh: Grok three flavors of #define line, uniquify.
	* linux/hppa/syscallent.sh: File removed.
	* linux/powerpc/syscallent.sh: File removed.

diff --git a/linux/hppa/syscallent.sh b/linux/hppa/syscallent.sh
deleted file mode 100644 (file)
index bfa0158..0000000
--- a/linux/hppa/syscallent.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#      $Id$
-
-cat $* |
-sed -n 's/^#[ ]*define[ ][ ]*__NR_\([^ ]*\)[ ]*[^0-9()]*(__NR_Linux + \([0-9]*\))$/\1 \2/p' |
-       sort +1n |
-       awk '
-       BEGIN {
-               tabs = "\t\t\t\t\t\t\t\t"
-               call = -1;
-       }
-       {
-               while (++call < $2) {
-                       f = "printargs"
-                       n = "SYS_" call
-                       s = "\t{ -1,\t0,\t"
-                       s = s f ","
-                       s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-                       s = s "\"" n "\""
-                       s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-                       s = s "}, /* " call " */"
-                       print s
-               }
-               f = "sys_" $1
-               n = $1
-               s = "\t{ -1,\t0,\t"
-               s = s f ","
-               s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-               s = s "\"" n "\""
-               s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-               s = s "}, /* " call " */"
-               print s
-       }
-       END {
-               limit = call + 100
-               while (++call < limit) {
-                       f = "printargs"
-                       n = "SYS_" call
-                       s = "\t{ -1,\t0,\t"
-                       s = s f ","
-                       s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-                       s = s "\"" n "\""
-                       s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-                       s = s "}, /* " call " */"
-                       print s
-               }
-       }
-       '

diff --git a/linux/powerpc/syscallent.sh b/linux/powerpc/syscallent.sh
deleted file mode 100644 (file)
index ea0e0f7..0000000
--- a/linux/powerpc/syscallent.sh
+++ /dev/null
@@ -1,73 +0,0 @@
-#!/bin/sh
-# Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 3. The name of the author may not be used to endorse or promote products
-#    derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-#
-#      $Id$
-
-cat $* |
-       sed -n 's/^#[   ]*define[       ][      ]*__NR_\([^     ]*\)[   ]*[^0-9]*\([0-9]*\).*$/\1 \2/p' |
-       sort +1n |
-       awk '
-       BEGIN {
-               tabs = "\t\t\t\t\t\t\t\t"
-               call = -1;
-       }
-       {
-               while (++call < $2) {
-                       f = "printargs"
-                       n = "SYS_" call
-                       s = "\t{ -1,\t0,\t"
-                       s = s f ","
-                       s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-                       s = s "\"" n "\""
-                       s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-                       s = s "}, /* " call " */"
-                       print s
-               }
-               f = "sys_" $1
-               n = $1
-               s = "\t{ -1,\t0,\t"
-               s = s f ","
-               s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-               s = s "\"" n "\""
-               s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-               s = s "}, /* " call " */"
-               print s
-       }
-       END {
-               limit = call + 100
-               while (++call < limit) {
-                       f = "printargs"
-                       n = "SYS_" call
-                       s = "\t{ -1,\t0,\t"
-                       s = s f ","
-                       s = s substr(tabs, 1, 24/8 - int((length(f) + 1)/8))
-                       s = s "\"" n "\""
-                       s = s substr(tabs, 1, 16/8 - int((length(n) + 2)/8))
-                       s = s "}, /* " call " */"
-                       print s
-               }
-       }
-       '

diff --git a/syscallent.sh b/syscallent.sh
index e230bc24aa9fcdc42eb98ae039d37202ff4e0827..c9d57e4ad3aa5669b9d1666da61efb56cefa78fa 100644 (file)
--- a/syscallent.sh
+++ b/syscallent.sh
@@ -26,9 +26,11 @@
 #
 #      $Id$
 
-cat $* |
-       sed -n 's/^#[   ]*define[       ][      ]*SYS_\([^      ]*\)[   ]*[^0-9]*\([0-9]*\).*$/\1 \2/p' |
-       sort +1n |
+cat {1+"$@"} |
+       sed -n 's/^#[   ]*define[       ][      ]*SYS_\([^      ]*\)[   ]*[^0-9]*\([0-9]*\).*$/\1 \2/p
+s/^#[  ]*define[       ][      ]*__NR_\([^     ]*\)[   ]*[^0-9]*\([0-9]*\).*$/\1 \2/p
+s/^#[ ]*define[ ][ ]*__NR_\([^ ]*\)[ ]*[^0-9()]*(__NR_Linux + \([0-9]*\))$/\1 \2/p' |
+       sort +1n | uniq |
        awk '
        BEGIN {
                tabs = "\t\t\t\t\t\t\t\t"