Skip to content

Commit

Permalink
More type fixes ##analysis
Browse files Browse the repository at this point in the history
  • Loading branch information
@radare
radare committed Jun 20, 2024
1 parent d506670 commit a9c0e8a
Show file tree
Hide file tree
Showing 5 changed files with 99 additions and 52 deletions.
77 changes: 53 additions & 24 deletions libr/anal/d/types.sdb.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,22 @@ short=type
type.short=w
type.short.size=16

FILE=type
type.FILE=p
type.FILE.size=8

int=type
type.int=d
type.int.size=32

pid_t=type
type.pid_t=d
type.pid_t.size=32

size_t=type
type.size_t=d
type.size_t.size=32

long=type
type.long=x
type.long.size=64
Expand Down Expand Up @@ -3104,61 +3116,61 @@ func.warnc.ret=void
sysctlbyname=func
func.sysctlbyname.args=5
func.sysctlbyname.arg.0=const char *,name
func.sysctlbyname.arg.1=void*,oldp
func.sysctlbyname.arg.2=size_t*,oldlenp
func.sysctlbyname.arg.3=void*,newp
func.sysctlbyname.arg.4=sizei_t,newlen
func.sysctlbyname.arg.1=void *,oldp
func.sysctlbyname.arg.2=size_t *,oldlenp
func.sysctlbyname.arg.3=void *,newp
func.sysctlbyname.arg.4=size_t,newlen
func.sysctlbyname.ret=int

sysctl=func
func.sysctl.args=6
func.sysctl.arg.0=const char *,name
func.sysctl.arg.1=int,namelen
func.sysctl.arg.2=void*,oldp
func.sysctl.arg.3=size_t*,oldlenp
func.sysctl.arg.4=void*,newp
func.sysctl.arg.5=sizei_t,newlen
func.sysctl.arg.2=void *,oldp
func.sysctl.arg.3=size_t *,oldlenp
func.sysctl.arg.4=void *,newp
func.sysctl.arg.5=size_t,newlen
func.sysctl.ret=int

sysctlnametomib=func
func.sysctlnametomib.args=3
func.sysctlnametomib.arg.0=const char *,name
func.sysctlnametomib.arg.1=int*,mib
func.sysctlnametomib.arg.2=size_t*,sizep
func.sysctlnametomib.arg.1=int *,mib
func.sysctlnametomib.arg.2=size_t *,sizep
func.sysctlnametomib.ret=int

tgetent=func
func.tgetent.args=2
func.tgetent.arg.0=const char*,bp
func.tgetent.arg.1=const char*,name
func.tgetent.arg.0=const char *,bp
func.tgetent.arg.1=const char *,name
func.tgetent.ret=int

tgetflag=func
func.tgetflag.args=1
func.tgetflag.arg.0=const char*,id
func.tgetflag.arg.0=const char *,id
func.tgetflag.ret=int

tgetstr=func
func.tgetstr.args=2
func.tgetstr.arg.0=char*,id
func.tgetstr.arg.1=char**,area
func.tgetstr.arg.0=char *,id
func.tgetstr.arg.1=char **,area
func.tgetstr.ret=char*

tgetnum=func
func.tgetnum.args=1
func.tgetnum.arg.0=char*,id
func.tgetnum.arg.0=char *,id
func.tgetnum.ret=int

readlink=func
func.readlink.args=3
func.readlink.arg.0=const char*,path
func.readlink.arg.1=char*,buf
func.readlink.arg.0=const char *,path
func.readlink.arg.1=char *,buf
func.readlink.arg.2=int,bufsize
func.readlink.ret=int

listxattr=func
func.listxattr.args=4
func.listxattr.arg.0=const char*,path
func.listxattr.arg.0=const char *,path
func.listxattr.arg.1=char*,namebuf
func.listxattr.arg.2=int,fsize
func.listxattr.arg.3=int,options
Expand All @@ -3167,19 +3179,36 @@ func.listxattr.ret=int
getopt_long=func
func.getopt_long.args=5
func.getopt_long.arg.0=int,argc
func.getopt_long.arg.1=char**,argv
func.getopt_long.arg.1=char **,argv
func.getopt_long.arg.2=const char*,optstring
func.getopt_long.arg.3=void*,longopts
func.getopt_long.arg.3=void *,longopts
func.getopt_long.arg.4=int,longidx
func.getopt_long.ret=int

getbsize=func
func.getbsize.args=2
func.getbsize.arg.0=int*,hdrlenp
func.getbsize.arg.1=int*,bsizep
func.getbsize.ret=char*
func.getbsize.arg.0=int *,hdrlenp
func.getbsize.arg.1=int *,bsizep
func.getbsize.ret=char *

fflagtostr=func
func.fflagtostr.args=1
func.fflagtostr.arg.0=int,flags
func.fflagtostr.ret=char*

tcgetpgrp=func
func.tcgetpgrp.args=1
func.tcgetpgrp.arg.0=int,fd
func.tcgetpgrp.ret=pid_t

sigprocmask=func
func.sigprocmask.args=3
func.sigprocmask.arg.0=int,how
func.sigprocmask.arg.1=void *,set
func.sigprocmask.arg.2=void *,oldset
func.sigprocmask.ret=pid_t

fflush_unlocked=func
func.fflush_unlocked.args=1
func.fflush_unlocked.arg.0=FILE *,stream
func.fflush_unlocked.ret=int
2 changes: 1 addition & 1 deletion libr/socket/socket_http.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static char *socket_http_answer(RSocket *s, int *code, int *rlen, ut32 redirecti
len = olen - (dn - buf);
}
if (len == 0) {
eprintf ("LEN = 0\n");
R_LOG_DEBUG ("LEN = 0");
}
if (len > 0) {
if (len > olen) {
Expand Down
66 changes: 42 additions & 24 deletions test/db/cmd/cmd_k
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ EXPECT=<<EOF
"cur_cmd": [
"types",
"*aligned_alloc=func",
"FILE=type",
"_Exit=func",
"__assert_fail=func",
"__bzero=func",
Expand Down Expand Up @@ -676,6 +677,7 @@ EXPECT=<<EOF
"feupdateenv=func",
"fflagtostr=func",
"fflush=func",
"fflush_unlocked=func",
"fgetc=func",
"fgetpos=func",
"fgets=func",
Expand Down Expand Up @@ -1150,6 +1152,9 @@ EXPECT=<<EOF
"func.fflush.arg.0=FILE *,stream",
"func.fflush.args=1",
"func.fflush.ret=int",
"func.fflush_unlocked.arg.0=FILE *,stream",
"func.fflush_unlocked.args=1",
"func.fflush_unlocked.ret=int",
"func.fgetc.arg.0=FILE *,stream",
"func.fgetc.args=1",
"func.fgetc.ret=int",
Expand Down Expand Up @@ -1347,10 +1352,10 @@ EXPECT=<<EOF
"func.fwscanf.arg.1=const wchar_t *,format",
"func.fwscanf.args=2",
"func.fwscanf.ret=int",
"func.getbsize.arg.0=int*,hdrlenp",
"func.getbsize.arg.1=int*,bsizep",
"func.getbsize.arg.0=int *,hdrlenp",
"func.getbsize.arg.1=int *,bsizep",
"func.getbsize.args=2",
"func.getbsize.ret=char*",
"func.getbsize.ret=char *",
"func.getc.arg.0=FILE *,stream",
"func.getc.args=1",
"func.getc.ret=int",
Expand All @@ -1367,9 +1372,9 @@ EXPECT=<<EOF
"func.getopt.args=3",
"func.getopt.ret=int",
"func.getopt_long.arg.0=int,argc",
"func.getopt_long.arg.1=char**,argv",
"func.getopt_long.arg.1=char **,argv",
"func.getopt_long.arg.2=const char*,optstring",
"func.getopt_long.arg.3=void*,longopts",
"func.getopt_long.arg.3=void *,longopts",
"func.getopt_long.arg.4=int,longidx",
"func.getopt_long.args=5",
"func.getopt_long.ret=int",
Expand Down Expand Up @@ -1606,7 +1611,7 @@ EXPECT=<<EOF
"func.lgammal.arg.0=long double,x",
"func.lgammal.args=1",
"func.lgammal.ret=long double",
"func.listxattr.arg.0=const char*,path",
"func.listxattr.arg.0=const char *,path",
"func.listxattr.arg.1=char*,namebuf",
"func.listxattr.arg.2=int,fsize",
"func.listxattr.arg.3=int,options",
Expand Down Expand Up @@ -1993,8 +1998,8 @@ EXPECT=<<EOF
"func.read.arg.2=size_t,nbyte",
"func.read.args=3",
"func.read.ret=ssize_t",
"func.readlink.arg.0=const char*,path",
"func.readlink.arg.1=char*,buf",
"func.readlink.arg.0=const char *,path",
"func.readlink.arg.1=char *,buf",
"func.readlink.arg.2=int,bufsize",
"func.readlink.args=3",
"func.readlink.ret=int",
Expand Down Expand Up @@ -2151,6 +2156,11 @@ EXPECT=<<EOF
"func.signbit.arg.0=arithmetic,x",
"func.signbit.args=1",
"func.signbit.ret=bool",
"func.sigprocmask.arg.0=int,how",
"func.sigprocmask.arg.1=void *,set",
"func.sigprocmask.arg.2=void *,oldset",
"func.sigprocmask.args=3",
"func.sigprocmask.ret=pid_t",
"func.sin.arg.0=arithmetic,x",
"func.sin.args=1",
"func.sin.ret=floating_point",
Expand Down Expand Up @@ -2426,22 +2436,22 @@ EXPECT=<<EOF
"func.symlink.ret=int",
"func.sysctl.arg.0=const char *,name",
"func.sysctl.arg.1=int,namelen",
"func.sysctl.arg.2=void*,oldp",
"func.sysctl.arg.3=size_t*,oldlenp",
"func.sysctl.arg.4=void*,newp",
"func.sysctl.arg.5=sizei_t,newlen",
"func.sysctl.arg.2=void *,oldp",
"func.sysctl.arg.3=size_t *,oldlenp",
"func.sysctl.arg.4=void *,newp",
"func.sysctl.arg.5=size_t,newlen",
"func.sysctl.args=6",
"func.sysctl.ret=int",
"func.sysctlbyname.arg.0=const char *,name",
"func.sysctlbyname.arg.1=void*,oldp",
"func.sysctlbyname.arg.2=size_t*,oldlenp",
"func.sysctlbyname.arg.3=void*,newp",
"func.sysctlbyname.arg.4=sizei_t,newlen",
"func.sysctlbyname.arg.1=void *,oldp",
"func.sysctlbyname.arg.2=size_t *,oldlenp",
"func.sysctlbyname.arg.3=void *,newp",
"func.sysctlbyname.arg.4=size_t,newlen",
"func.sysctlbyname.args=5",
"func.sysctlbyname.ret=int",
"func.sysctlnametomib.arg.0=const char *,name",
"func.sysctlnametomib.arg.1=int*,mib",
"func.sysctlnametomib.arg.2=size_t*,sizep",
"func.sysctlnametomib.arg.1=int *,mib",
"func.sysctlnametomib.arg.2=size_t *,sizep",
"func.sysctlnametomib.args=3",
"func.sysctlnametomib.ret=int",
"func.system.arg.0=const char *,string",
Expand All @@ -2465,6 +2475,9 @@ EXPECT=<<EOF
"func.tanl.arg.0=long double,x",
"func.tanl.args=1",
"func.tanl.ret=long double",
"func.tcgetpgrp.arg.0=int,fd",
"func.tcgetpgrp.args=1",
"func.tcgetpgrp.ret=pid_t",
"func.textdomain.arg.0=char *,domainname",
"func.textdomain.args=1",
"func.textdomain.ret=char *",
Expand All @@ -2477,18 +2490,18 @@ EXPECT=<<EOF
"func.tgammal.arg.0=long double,x",
"func.tgammal.args=1",
"func.tgammal.ret=long double",
"func.tgetent.arg.0=const char*,bp",
"func.tgetent.arg.1=const char*,name",
"func.tgetent.arg.0=const char *,bp",
"func.tgetent.arg.1=const char *,name",
"func.tgetent.args=2",
"func.tgetent.ret=int",
"func.tgetflag.arg.0=const char*,id",
"func.tgetflag.arg.0=const char *,id",
"func.tgetflag.args=1",
"func.tgetflag.ret=int",
"func.tgetnum.arg.0=char*,id",
"func.tgetnum.arg.0=char *,id",
"func.tgetnum.args=1",
"func.tgetnum.ret=int",
"func.tgetstr.arg.0=char*,id",
"func.tgetstr.arg.1=char**,area",
"func.tgetstr.arg.0=char *,id",
"func.tgetstr.arg.1=char **,area",
"func.tgetstr.args=2",
"func.tgetstr.ret=char*",
"func.tgoto.arg.0=const char *,cap",
Expand Down Expand Up @@ -3060,6 +3073,7 @@ EXPECT=<<EOF
"sigaction=func",
"signal=func",
"signbit=func",
"sigprocmask=func",
"sin=func",
"sinf=func",
"sinh=func",
Expand Down Expand Up @@ -3136,6 +3150,7 @@ EXPECT=<<EOF
"tanhf=func",
"tanhl=func",
"tanl=func",
"tcgetpgrp=func",
"textdomain=func",
"tgamma=func",
"tgammaf=func",
Expand All @@ -3156,6 +3171,8 @@ EXPECT=<<EOF
"trunc=func",
"truncf=func",
"truncl=func",
"type.FILE=p",
"type.FILE.size=8",
"type.char=c",
"type.char *=z",
"type.char **=*z",
Expand Down Expand Up @@ -3183,6 +3200,7 @@ EXPECT=<<EOF
"type.long.size=64",
"type.pid_t=d",
"type.pid_t.pid=32",
"type.pid_t.size=32",
"type.short=w",
"type.short.size=16",
"type.size_t=d",
Expand Down
2 changes: 1 addition & 1 deletion test/db/cmd/cmd_pd_str
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ s..5343
pd 30~(
EOF
EXPECT=<<EOF
; int listxattr(?, ?, -1, -1)
; int listxattr(-1, ?, -1, -1)
; void *reallocf(-1, -1)
call sym.imp.getxattr ; sym.imp.getxattr(-1, -1, 0x0, 0x0)
; size_t strlen(-1)
Expand Down
4 changes: 2 additions & 2 deletions test/db/cmd/projects
View file
Original file line number Diff line number Diff line change
Expand Up @@ -346,8 +346,8 @@ PS* ctypes~?Foo
P- ctypes > /dev/null
EOF
EXPECT=<<EOF
10
10
12
12
8
EOF
RUN
Expand Down

0 comments on commit a9c0e8a

Please sign in to comment.