diff options
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | display_args.c | 20 | ||||
| -rwxr-xr-x | install-sh | 323 | ||||
| -rw-r--r-- | ltrace.h | 18 | ||||
| -rw-r--r-- | output.c | 18 | ||||
| -rw-r--r-- | read_config_file.c | 28 |
6 files changed, 371 insertions, 43 deletions
@@ -1,3 +1,10 @@ +2006-02-16 Richard Kettlewell <rjk@nchiper.com> + + * display_args.c: update to handle variable length strings arguments + * ltrace.h: likewise + * output.c: likewise + * read_config_file.c: likewise + 2006-02-16 Bernd Zeimetz <bernd@zeimetz.de> * ltrace.1: reference reportbug diff --git a/display_args.c b/display_args.c index 87fd084..9a988e1 100644 --- a/display_args.c +++ b/display_args.c @@ -17,11 +17,13 @@ static int display_unknown(enum tof type, struct process * proc, int arg_num); static int display_format(enum tof type, struct process * proc, int arg_num); int -display_arg(enum tof type, struct process * proc, int arg_num, enum arg_type at) { +display_arg(enum tof type, struct process * proc, int arg_num, const struct complete_arg_type *at) { int tmp; long arg; - switch(at) { + if(!at) + return display_unknown(type, proc, arg_num); + switch(at->at) { case ARGTYPE_VOID: return 0; case ARGTYPE_INT: @@ -50,18 +52,8 @@ display_arg(enum tof type, struct process * proc, int arg_num, enum arg_type at) return display_format(type, proc, arg_num); case ARGTYPE_STRING: return display_string(type, proc, arg_num); - case ARGTYPE_STRING0: - return display_stringN(0, type, proc, arg_num); - case ARGTYPE_STRING1: - return display_stringN(1, type, proc, arg_num); - case ARGTYPE_STRING2: - return display_stringN(2, type, proc, arg_num); - case ARGTYPE_STRING3: - return display_stringN(3, type, proc, arg_num); - case ARGTYPE_STRING4: - return display_stringN(4, type, proc, arg_num); - case ARGTYPE_STRING5: - return display_stringN(5, type, proc, arg_num); + case ARGTYPE_STRINGN: + return display_stringN(at->argno, type, proc, arg_num); case ARGTYPE_UNKNOWN: default: return display_unknown(type, proc, arg_num); diff --git a/install-sh b/install-sh new file mode 100755 index 0000000..4d4a951 --- /dev/null +++ b/install-sh @@ -0,0 +1,323 @@ +#!/bin/sh +# install - install a program, script, or datafile + +scriptversion=2005-05-14.22 + +# This originates from X11R5 (mit/util/scripts/install.sh), which was +# later released in X11R6 (xc/config/util/install.sh) with the +# following copyright and license. +# +# Copyright (C) 1994 X Consortium +# +# Permission is hereby granted, free of charge, to any person obtaining a copy +# of this software and associated documentation files (the "Software"), to +# deal in the Software without restriction, including without limitation the +# rights to use, copy, modify, merge, publish, distribute, sublicense, and/or +# sell copies of the Software, and to permit persons to whom the Software is +# furnished to do so, subject to the following conditions: +# +# The above copyright notice and this permission notice shall be included in +# all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +# X CONSORTIUM BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN +# AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNEC- +# TION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +# +# Except as contained in this notice, the name of the X Consortium shall not +# be used in advertising or otherwise to promote the sale, use or other deal- +# ings in this Software without prior written authorization from the X Consor- +# tium. +# +# +# FSF changes to this file are in the public domain. +# +# Calling this script install-sh is preferred over install.sh, to prevent +# `make' implicit rules from creating a file called install from it +# when there is no Makefile. +# +# This script is compatible with the BSD install script, but was written +# from scratch. It can only install one file at a time, a restriction +# shared with many OS's install programs. + +# set DOITPROG to echo to test this script + +# Don't use :- since 4.3BSD and earlier shells don't like it. +doit="${DOITPROG-}" + +# put in absolute paths if you don't have them in your path; or use env. vars. + +mvprog="${MVPROG-mv}" +cpprog="${CPPROG-cp}" +chmodprog="${CHMODPROG-chmod}" +chownprog="${CHOWNPROG-chown}" +chgrpprog="${CHGRPPROG-chgrp}" +stripprog="${STRIPPROG-strip}" +rmprog="${RMPROG-rm}" +mkdirprog="${MKDIRPROG-mkdir}" + +chmodcmd="$chmodprog 0755" +chowncmd= +chgrpcmd= +stripcmd= +rmcmd="$rmprog -f" +mvcmd="$mvprog" +src= +dst= +dir_arg= +dstarg= +no_target_directory= + +usage="Usage: $0 [OPTION]... [-T] SRCFILE DSTFILE + or: $0 [OPTION]... SRCFILES... DIRECTORY + or: $0 [OPTION]... -t DIRECTORY SRCFILES... + or: $0 [OPTION]... -d DIRECTORIES... + +In the 1st form, copy SRCFILE to DSTFILE. +In the 2nd and 3rd, copy all SRCFILES to DIRECTORY. +In the 4th, create DIRECTORIES. + +Options: +-c (ignored) +-d create directories instead of installing files. +-g GROUP $chgrpprog installed files to GROUP. +-m MODE $chmodprog installed files to MODE. +-o USER $chownprog installed files to USER. +-s $stripprog installed files. +-t DIRECTORY install into DIRECTORY. +-T report an error if DSTFILE is a directory. +--help display this help and exit. +--version display version info and exit. + +Environment variables override the default commands: + CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG +" + +while test -n "$1"; do + case $1 in + -c) shift + continue;; + + -d) dir_arg=true + shift + continue;; + + -g) chgrpcmd="$chgrpprog $2" + shift + shift + continue;; + + --help) echo "$usage"; exit $?;; + + -m) chmodcmd="$chmodprog $2" + shift + shift + continue;; + + -o) chowncmd="$chownprog $2" + shift + shift + continue;; + + -s) stripcmd=$stripprog + shift + continue;; + + -t) dstarg=$2 + shift + shift + continue;; + + -T) no_target_directory=true + shift + continue;; + + --version) echo "$0 $scriptversion"; exit $?;; + + *) # When -d is used, all remaining arguments are directories to create. + # When -t is used, the destination is already specified. + test -n "$dir_arg$dstarg" && break + # Otherwise, the last argument is the destination. Remove it from $@. + for arg + do + if test -n "$dstarg"; then + # $@ is not empty: it contains at least $arg. + set fnord "$@" "$dstarg" + shift # fnord + fi + shift # arg + dstarg=$arg + done + break;; + esac +done + +if test -z "$1"; then + if test -z "$dir_arg"; then + echo "$0: no input file specified." >&2 + exit 1 + fi + # It's OK to call `install-sh -d' without argument. + # This can happen when creating conditional directories. + exit 0 +fi + +for src +do + # Protect names starting with `-'. + case $src in + -*) src=./$src ;; + esac + + if test -n "$dir_arg"; then + dst=$src + src= + + if test -d "$dst"; then + mkdircmd=: + chmodcmd= + else + mkdircmd=$mkdirprog + fi + else + # Waiting for this to be detected by the "$cpprog $src $dsttmp" command + # might cause directories to be created, which would be especially bad + # if $src (and thus $dsttmp) contains '*'. + if test ! -f "$src" && test ! -d "$src"; then + echo "$0: $src does not exist." >&2 + exit 1 + fi + + if test -z "$dstarg"; then + echo "$0: no destination specified." >&2 + exit 1 + fi + + dst=$dstarg + # Protect names starting with `-'. + case $dst in + -*) dst=./$dst ;; + esac + + # If destination is a directory, append the input filename; won't work + # if double slashes aren't ignored. + if test -d "$dst"; then + if test -n "$no_target_directory"; then + echo "$0: $dstarg: Is a directory" >&2 + exit 1 + fi + dst=$dst/`basename "$src"` + fi + fi + + # This sed command emulates the dirname command. + dstdir=`echo "$dst" | sed -e 's,/*$,,;s,[^/]*$,,;s,/*$,,;s,^$,.,'` + + # Make sure that the destination directory exists. + + # Skip lots of stat calls in the usual case. + if test ! -d "$dstdir"; then + defaultIFS=' + ' + IFS="${IFS-$defaultIFS}" + + oIFS=$IFS + # Some sh's can't handle IFS=/ for some reason. + IFS='%' + set x `echo "$dstdir" | sed -e 's@/@%@g' -e 's@^%@/@'` + shift + IFS=$oIFS + + pathcomp= + + while test $# -ne 0 ; do + pathcomp=$pathcomp$1 + shift + if test ! -d "$pathcomp"; then + $mkdirprog "$pathcomp" + # mkdir can fail with a `File exist' error in case several + # install-sh are creating the directory concurrently. This + # is OK. + test -d "$pathcomp" || exit + fi + pathcomp=$pathcomp/ + done + fi + + if test -n "$dir_arg"; then + $doit $mkdircmd "$dst" \ + && { test -z "$chowncmd" || $doit $chowncmd "$dst"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dst"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dst"; } + + else + dstfile=`basename "$dst"` + + # Make a couple of temp file names in the proper directory. + dsttmp=$dstdir/_inst.$$_ + rmtmp=$dstdir/_rm.$$_ + + # Trap to clean up those temp files at exit. + trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0 + trap '(exit $?); exit' 1 2 13 15 + + # Copy the file name to the temp name. + $doit $cpprog "$src" "$dsttmp" && + + # and set any options; do chmod last to preserve setuid bits. + # + # If any of these fail, we abort the whole thing. If we want to + # ignore errors from any of these, just make sure not to ignore + # errors from the above "$doit $cpprog $src $dsttmp" command. + # + { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \ + && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \ + && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \ + && { test -z "$chmodcmd" || $doit $chmodcmd "$dsttmp"; } && + + # Now rename the file to the real destination. + { $doit $mvcmd -f "$dsttmp" "$dstdir/$dstfile" 2>/dev/null \ + || { + # The rename failed, perhaps because mv can't rename something else + # to itself, or perhaps because mv is so ancient that it does not + # support -f. + + # Now remove or move aside any old file at destination location. + # We try this two ways since rm can't unlink itself on some + # systems and the destination file might be busy for other + # reasons. In this case, the final cleanup might fail but the new + # file should still install successfully. + { + if test -f "$dstdir/$dstfile"; then + $doit $rmcmd -f "$dstdir/$dstfile" 2>/dev/null \ + || $doit $mvcmd -f "$dstdir/$dstfile" "$rmtmp" 2>/dev/null \ + || { + echo "$0: cannot unlink or rename $dstdir/$dstfile" >&2 + (exit 1); exit 1 + } + else + : + fi + } && + + # Now rename the file to the real destination. + $doit $mvcmd "$dsttmp" "$dstdir/$dstfile" + } + } + fi || { (exit 1); exit 1; } +done + +# The final little trick to "correctly" pass the exit status to the exit trap. +{ + (exit 0); exit 0 +} + +# Local variables: +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-end: "$" +# End: @@ -40,12 +40,12 @@ enum arg_type { ARGTYPE_FILE, ARGTYPE_FORMAT, /* printf-like format */ ARGTYPE_STRING, - ARGTYPE_STRING0, /* stringN: string up to (arg N) bytes */ - ARGTYPE_STRING1, - ARGTYPE_STRING2, - ARGTYPE_STRING3, - ARGTYPE_STRING4, - ARGTYPE_STRING5 + ARGTYPE_STRINGN, +}; + +struct complete_arg_type { + enum arg_type at; + int argno; /* for STRINGN */ }; enum tof { @@ -58,9 +58,9 @@ enum tof { struct function { const char * name; - enum arg_type return_type; + struct complete_arg_type return_type; int num_params; - enum arg_type arg_types[MAX_ARGS]; + struct complete_arg_type arg_types[MAX_ARGS]; int params_right; struct function * next; }; @@ -142,7 +142,7 @@ extern void * instruction_pointer; extern struct event * wait_for_something(void); extern void process_event(struct event * event); extern void execute_program(struct process *, char **); -extern int display_arg(enum tof type, struct process * proc, int arg_num, enum arg_type at); +extern int display_arg(enum tof type, struct process * proc, int arg_num, const struct complete_arg_type *at); extern struct breakpoint * address2bpstruct(struct process * proc, void * addr); extern void breakpoints_init(struct process * proc); extern void insert_breakpoint(struct process * proc, void * addr); @@ -179,19 +179,19 @@ output_left(enum tof type, struct process * proc, char * function_name) { if (!func) { int i; for(i=0; i<4; i++) { - current_column += display_arg(type, proc, i, ARGTYPE_UNKNOWN); + current_column += display_arg(type, proc, i, 0); current_column += fprintf(output, ", "); } - current_column += display_arg(type, proc, 4, ARGTYPE_UNKNOWN); + current_column += display_arg(type, proc, 4, 0); return; } else { int i; for(i=0; i< func->num_params - func->params_right - 1; i++) { - current_column += display_arg(type, proc, i, func->arg_types[i]); + current_column += display_arg(type, proc, i, &func->arg_types[i]); current_column += fprintf(output, ", "); } if (func->num_params>func->params_right) { - current_column += display_arg(type, proc, i, func->arg_types[i]); + current_column += display_arg(type, proc, i, &func->arg_types[i]); if (func->params_right) { current_column += fprintf(output, ", "); } @@ -255,23 +255,23 @@ output_right(enum tof type, struct process * proc, char * function_name) { current_column += fprintf(output, ") "); tabto(opt_a-1); fprintf(output, "= "); - display_arg(type, proc, -1, ARGTYPE_UNKNOWN); + display_arg(type, proc, -1, 0); } else { int i; for(i=func->num_params-func->params_right; i<func->num_params-1; i++) { - current_column += display_arg(type, proc, i, func->arg_types[i]); + current_column += display_arg(type, proc, i, &func->arg_types[i]); current_column += fprintf(output, ", "); } if (func->params_right) { - current_column += display_arg(type, proc, i, func->arg_types[i]); + current_column += display_arg(type, proc, i, &func->arg_types[i]); } current_column += fprintf(output, ") "); tabto(opt_a-1); fprintf(output, "= "); - if (func->return_type == ARGTYPE_VOID) { + if (func->return_type.at == ARGTYPE_VOID) { fprintf(output, "<void>"); } else { - display_arg(type, proc, -1, func->return_type); + display_arg(type, proc, -1, &func->return_type); } } if (opt_T) { diff --git a/read_config_file.c b/read_config_file.c index bdceef5..e0b8ac2 100644 --- a/read_config_file.c +++ b/read_config_file.c @@ -41,28 +41,34 @@ static struct list_of_pt_t { { "file", ARGTYPE_FILE }, { "format", ARGTYPE_FORMAT }, { "string", ARGTYPE_STRING }, - { "string0",ARGTYPE_STRING0 }, - { "string1",ARGTYPE_STRING1 }, - { "string2",ARGTYPE_STRING2 }, - { "string3",ARGTYPE_STRING3 }, - { "string4",ARGTYPE_STRING4 }, - { "string5",ARGTYPE_STRING5 }, { NULL, ARGTYPE_UNKNOWN } /* Must finish with NULL */ }; -static enum arg_type +static struct complete_arg_type str2type(char ** str) { struct list_of_pt_t * tmp = &list_of_pt[0]; + struct complete_arg_type pt; + + if (!strncmp(*str, "string", 6) + && isdigit((unsigned char)(*str)[6])) + { + pt.at = ARGTYPE_STRINGN; + pt.argno = atoi(*str + 6); + *str += strspn(*str, "string0123456789"); + return pt; + } while(tmp->name) { if (!strncmp(*str, tmp->name, strlen(tmp->name)) && index(" ,)#", *(*str+strlen(tmp->name)))) { *str += strlen(tmp->name); - return tmp->pt; + pt.at = tmp->pt; + return pt; } tmp++; } - return ARGTYPE_UNKNOWN; + pt.at = ARGTYPE_UNKNOWN; + return pt; } static void @@ -113,7 +119,7 @@ process_line (char * buf) { debug(3, "Reading line %d of `%s'", line_no, filename); eat_spaces(&str); fun.return_type = str2type(&str); - if (fun.return_type==ARGTYPE_UNKNOWN) { + if (fun.return_type.at==ARGTYPE_UNKNOWN) { debug(3, " Skipping line %d", line_no); return NULL; } @@ -141,7 +147,7 @@ process_line (char * buf) { fun.params_right++; } fun.arg_types[i] = str2type(&str); - if (fun.return_type==ARGTYPE_UNKNOWN) { + if (fun.return_type.at==ARGTYPE_UNKNOWN) { output_line(0, "Syntax error in `%s', line %d", filename, line_no); return NULL; } |