Split ltrace.conf into libc.so.conf and libacl.so.conf; add libm.so.conf

- This won't work as is--if libc.so.6.conf isn't found, ltrace needs
  to keep looking for libc.so.conf.

Author: Petr Machata

Makefile.am

@@ -64,7 +64,8 @@ dist_man5_MANS = ltrace.conf.5
 
 dist_doc_DATA = COPYING CREDITS INSTALL README TODO
 
-dist_pkgdata_DATA = etc/syscalls.conf etc/ltrace.conf
+dist_pkgdata_DATA = etc/syscalls.conf etc/libc.so.conf	\
+	etc/libm.so.conf etc/libacl.so.conf
 
 EXTRA_DIST = \
 	debian/changelog \

etc/libacl.so.conf

@@ -0,0 +1,43 @@
+# See ltrace.conf(5) for description of syntax of this file.
+
+# sys/acl.h
+int acl_add_perm(addr,uint);
+int acl_calc_mask(addr);
+int acl_clear_perms(addr);
+int acl_copy_entry(addr,addr);
+int acl_copy_ext(addr,addr,int);
+addr acl_copy_int(addr);
+int acl_create_entry(addr,addr);
+int acl_delete_def_file(string);
+int acl_delete_entry(addr,addr);
+int acl_delete_perm(addr,uint);
+addr acl_dup(addr);
+int acl_free(addr);
+addr acl_from_text(string);
+int acl_get_entry(addr,int,addr);
+addr acl_get_fd(int);
+addr acl_get_file(string,int);
+int acl_get_permset(addr,addr);
+addr acl_get_qualifier(addr);
+int acl_get_tag_type(addr,addr);
+addr acl_init(int);
+int acl_set_fd(int,addr);
+int acl_set_file(string,int,addr);
+int acl_set_permset(addr,addr);
+int acl_set_qualifier(addr,addr);
+int acl_set_tag_type(addr,int);
+int acl_size(addr);
+string acl_to_text(addr,addr);
+int acl_valid(addr);
+
+# acl/libacl.h
+int acl_check(addr,addr);
+int acl_cmp(addr,addr);
+int acl_entries(addr);
+int acl_equiv_mode(addr,addr);
+string acl_error(int);
+int acl_extended_fd(int);
+int acl_extended_file(string);
+addr acl_from_mode(octal);
+int acl_get_perm(addr,uint);
+string acl_to_any_text(addr,string,char,int);

etc/ltrace.conf etc/libc.so.conf

@@ -1,13 +1,6 @@
-; ltrace.conf
-;
-; ~/.ltrace.conf will also be read, if it exists. The -F option may be
-; used to suppress the automatic inclusion of both this file and
-; ~/.ltrace.conf, and load a different config file or config files
-; instead.
-;
-; See ltrace.conf(5) for description of syntax of this file.
-
-; arpa/inet.h
+# See ltrace.conf(5) for description of syntax of this file.
+
+# arpa/inet.h
 typedef in_addr = struct(hex(uint));
 int inet_aton(string, +in_addr*);
 hex(uint) inet_addr(string);
@@ -17,42 +10,42 @@ in_addr inet_makeaddr(hex(int), hex(int));
 hex(uint) inet_lnaof(in_addr);
 hex(uint) inet_netof(in_addr);
 
-; bfd.h
+# bfd.h
 void bfd_init();
 int bfd_set_default_target(string);
 addr bfd_scan_vma(string, addr, int);
 addr bfd_openr(string,string);
 int bfd_check_format(addr,int);
 
-; ctype.h
+# ctype.h
 char tolower(char);
 char toupper(char);
 addr __ctype_b_loc();
 addr __ctype_tolower_loc();
 addr __ctype_toupper_loc();
 ulong __ctype_get_mb_cur_max();
 
-; curses.h
+# curses.h
 int waddch(addr, char);
 int mvprintw(int, int, format);
 int wmove(addr, int, int);
 int waddnstr(addr, string, int);
 string tgoto(string, int, int);
 
-; dirent.h
+# dirent.h
 
-; We can't portably rely on DIR internals at all.  Ideally this would
-; be implemented in a per-OS config file, but even on Linux, we don't
-; know whether there's a lock in the structure or not.  Luckily the
-; one interesting datum, file descriptor, we can access reliably.
-; Having the structure half-defined like this is potentially
-; problematic as structure size influences parameter passing.  But
-; POSIX always uses pointer to the structure, so it's fine.
+# We can't portably rely on DIR internals at all.  Ideally this would
+# be implemented in a per-OS config file, but even on Linux, we don't
+# know whether there's a lock in the structure or not.  Luckily the
+# one interesting datum, file descriptor, we can access reliably.
+# Having the structure half-defined like this is potentially
+# problematic as structure size influences parameter passing.  But
+# POSIX always uses pointer to the structure, so it's fine.
 
 typedef DIR = struct(int);
 
-; XXX We can't represent the following portably without having either
-; uulong, or directly uint64_t.'
+# XXX We can't represent the following portably without having either
+# uulong, or directly uint64_t.'
 
 typedef ino_t = ulong;
 typedef ino_t64 = ulong;
@@ -72,49 +65,49 @@ void rewinddir(DIR *);
 long telldir(DIR *);
 void seekdir(DIR *, long);
 
-; dlfcn.h
+# dlfcn.h
 addr  dlopen(string, int);
 string dlerror();
 addr  dlsym(addr, string);
 int dlclose(addr);
 
-; errno.h
+# errno.h
 addr __errno_location();
 
-; fcntl.h
+# fcntl.h
 int open(string,int,octal);		; WARNING: 3rd argument may not be there
 int open64(string,int,octal);		; WARNING: 3rd argument may not be there
 
-; fnmatch.h
+# fnmatch.h
 int fnmatch(string, string, int);
 
-; getopt.h
+# getopt.h
 int getopt_long(int,addr,string,addr,int*);
 int getopt_long_only(int,addr,string,addr,addr);
 
-; grp.h
+# grp.h
 void endgrent();
 addr getgrnam(string);
 void setgrent();
 addr getgrent();
 
-; libintl.h
+# libintl.h
 string __dcgettext(string,string,int);
 string bindtextdomain(string, string);
 string textdomain(string);
 
-; libio.h
+# libio.h
 char _IO_getc(file);
 int _IO_putc(char,file);
 
-; locale.h
+# locale.h
 string setlocale(enum(LC_CTYPE=0, LC_NUMERIC=1, LC_TIME=2, LC_COLLATE=3, LC_MONETARY=4, LC_MESSAGES=5, LC_ALL=6, LC_PAPER=7, LC_NAME=8, LC_ADDRESS=9, LC_TELEPHONE=10, LC_MEASUREMENT=11, LC_IDENTIFICATION=12), string);
 
-; mcheck.h
+# mcheck.h
 void mtrace();
 void muntrace();
 
-; mqueue.h
+# mqueue.h
 int mq_open(string, int, octal, addr);  ; WARNING: 3rd and 4th arguments may not be there
 int mq_close(int);
 int mq_unlink(string);
@@ -126,7 +119,7 @@ int mq_timedsend(int, string3, ulong, uint, addr);
 long mq_receive(int, +string0, ulong, addr);
 long mq_timedreceive(int, +string0, ulong, addr, addr);
 
-; netdb.h
+# netdb.h
 void endhostent();
 void endnetent();
 void endnetgrent();
@@ -165,29 +158,29 @@ int setnetgrent(string);
 void setprotoent(int);
 void setservent(int);
 
-; netinet/in.h
+# netinet/in.h
 uint ntohs(uint);
 
-; pcap.h
+# pcap.h
 string pcap_lookupdev(addr);
 addr pcap_open_live(string, int, int, int, addr);
 int pcap_snapshot(addr);
 int pcap_lookupnet(string, addr, addr, addr);
 int pcap_compile(addr, addr, string, int, addr);
 
-; pwd.h
+# pwd.h
 string getpass(string);
 void endpwent();
 addr getpwnam(string);
 void setpwent();
 
-; readline/readline.h
+# readline/readline.h
 string readline(string);
 
-; signal.h
+# signal.h
 typedef signum = enum(SIGHUP=1, SIGINT=2, SIGQUIT=3, SIGILL=4, SIGTRAP=5, SIGABRT=6, SIGBUS=7, SIGFPE=8, SIGKILL=9, SIGUSR1=10, SIGSEGV=11, SIGUSR2=12, SIGPIPE=13, SIGALRM=14, SIGTERM=15, SIGSTKFLT=16, SIGCHLD=17, SIGCONT=18, SIGSTOP=19, SIGTSTP=20, SIGTTIN=21, SIGTTOU=22, SIGURG=23, SIGXCPU=24, SIGXFSZ=25, SIGVTALRM=26, SIGPROF=27, SIGWINCH=28, SIGIO=29, SIGPWR=30, SIGSYS=31, SIGRTMIN_0=32, SIGRTMIN_1=33, SIGRTMIN_2=34, SIGRTMIN_3=35, SIGRTMIN_4=36, SIGRTMIN_5=37, SIGRTMIN_6=38, SIGRTMIN_7=39, SIGRTMIN_8=40, SIGRTMIN_9=41, SIGRTMIN_10=42, SIGRTMIN_11=43, SIGRTMIN_12=44, SIGRTMIN_13=45, SIGRTMIN_14=46, SIGRTMIN_15=47, SIGRTMIN_16=48, SIGRTMIN_17=49, SIGRTMIN_18=50, SIGRTMIN_19=51, SIGRTMIN_20=52, SIGRTMIN_21=53, SIGRTMIN_22=54, SIGRTMIN_23=55, SIGRTMIN_24=56, SIGRTMIN_25=57, SIGRTMIN_26=58, SIGRTMIN_27=59, SIGRTMIN_28=60, SIGRTMIN_29=61, SIGRTMIN_30=62, SIGRTMIN_31=63);
 typedef sigset_t = bitvec(ulong);
-; elm3 should be flags
+# elm3 should be flags
 typedef sigaction = struct(addr, sigset_t, hex(int), addr);
 int kill(int, signum);
 int sigemptyset(+sigset_t*);
@@ -204,7 +197,7 @@ int sigisemptyset(sigset_t*);
 int sigorset(+sigset_t*, sigset_t*, sigset_t*);
 int sigandset(+sigset_t*, sigset_t*, sigset_t*);
 
-; stdio.h
+# stdio.h
 int fclose(file);
 int feof(file);
 int ferror(file);
@@ -238,7 +231,7 @@ void setbuffer(file,addr,ulong);
 void setlinebuf(file);
 int rename(string,string);
 
-; stdlib.h
+# stdlib.h
 long __strtol_internal(string,addr,int);
 ulong __strtoul_internal(string,addr,int);
 int atexit(addr);
@@ -276,7 +269,7 @@ void srand48(long);
 array(ushort,3)* seed48(array(ushort,3)*);
 void lcong48(array(ushort,7)*);
 
-; string.h
+# string.h
 void bcopy(addr,addr,ulong);
 void bzero(addr,ulong);
 string basename(string);
@@ -305,13 +298,13 @@ ulong strcspn(string,string);
 string strstr(string,string);
 string strtok(string, string);
 
-; sys/ioctl.h
+# sys/ioctl.h
 int ioctl(int, int, addr);
 
-; sys/socket.h
+# sys/socket.h
 int socket(int,int,int);
 
-; sys/stat.h
+# sys/stat.h
 int __fxstat(int,int,addr);
 int __xstat(int,string,addr);
 int __lxstat(int,string,addr);
@@ -323,33 +316,33 @@ int fchmod(int,octal);
 int mkfifo(string,octal);
 octal umask(octal);
 
-; sys/utsname.h
+# sys/utsname.h
 int uname(addr);
 
-; sys/vfs.h
+# sys/vfs.h
 int statfs(string,addr);
 
-; syslog.h
+# syslog.h
 void closelog();
 void openlog(string,int,int);
 void syslog(int,format);
 
-; term.h
+# term.h
 int tputs(string, int, addr);
 
-; termios.h
+# termios.h
 int tcgetattr(int,addr);
 int tcsetattr(int,int,addr);
 
-; time.h
+# time.h
 string ctime(addr);
 int gettimeofday(addr, addr);
 addr gmtime(addr);
 addr localtime(addr);
 ulong strftime(+string2,ulong,string,addr);
 long time(addr);
 
-; unistd.h
+# unistd.h
 void _exit(int);
 int access(string, int);
 uint alarm(uint);
@@ -401,66 +394,19 @@ int getpagesize();
 long lseek(int,long,int);
 int pipe(addr);
 
-; utmp.h
+# utmp.h
 void endutent();
 addr getutent();
 void setutent();
 
-; wchar.h
+# wchar.h
 int fwide(addr, int);
 
-; sys/wait.h
+# sys/wait.h
 int wait(addr);
 int waitpid(int,addr,int);
 
-; X11/Xlib.h
-void XCloseDisplay(addr);
-int XMapWindow(addr,addr);
-addr XOpenDisplay(string);
-
-; sys/acl.h
-int acl_add_perm(addr,uint);
-int acl_calc_mask(addr);
-int acl_clear_perms(addr);
-int acl_copy_entry(addr,addr);
-int acl_copy_ext(addr,addr,int);
-addr acl_copy_int(addr);
-int acl_create_entry(addr,addr);
-int acl_delete_def_file(string);
-int acl_delete_entry(addr,addr);
-int acl_delete_perm(addr,uint);
-addr acl_dup(addr);
-int acl_free(addr);
-addr acl_from_text(string);
-int acl_get_entry(addr,int,addr);
-addr acl_get_fd(int);
-addr acl_get_file(string,int);
-int acl_get_permset(addr,addr);
-addr acl_get_qualifier(addr);
-int acl_get_tag_type(addr,addr);
-addr acl_init(int);
-int acl_set_fd(int,addr);
-int acl_set_file(string,int,addr);
-int acl_set_permset(addr,addr);
-int acl_set_qualifier(addr,addr);
-int acl_set_tag_type(addr,int);
-int acl_size(addr);
-string acl_to_text(addr,addr);
-int acl_valid(addr);
-
-; acl/libacl.h
-int acl_check(addr,addr);
-int acl_cmp(addr,addr);
-int acl_entries(addr);
-int acl_equiv_mode(addr,addr);
-string acl_error(int);
-int acl_extended_fd(int);
-int acl_extended_file(string);
-addr acl_from_mode(octal);
-int acl_get_perm(addr,uint);
-string acl_to_any_text(addr,string,char,int);
-
-; other symbols not included above
+# other symbols not included above
 long a64l(string);
 string l64a(long);
 void abort();