JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

stop using ptrdiff_t

Browse Source
This commit is contained in:
tg
2014-11-25 20:00:39 +00:00
parent 0d9b36daa3
commit d25612b4b0
5 changed files with 23 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
Build.sh
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.669 2014/10/07 15:22:12 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.670 2014/11/25 20:00:36 tg Exp $'
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012, 2013, 2014 # 2011, 2012, 2013, 2014
@@ -1700,22 +1700,22 @@ rmf lft* # end of large file support test
ac_test can_inttypes '!' stdint_h 1 "for standard 32-bit integer types" <<-'EOF' ac_test can_inttypes '!' stdint_h 1 "for standard 32-bit integer types" <<-'EOF'
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h> #include <stddef.h>
int main(int ac, char **av) { return ((uint32_t)(ptrdiff_t)*av + (int32_t)ac); } int main(int ac, char **av) { return ((uint32_t)(size_t)*av + (int32_t)ac); }
EOF EOF
ac_test can_ucbints '!' can_inttypes 1 "for UCB 32-bit integer types" <<-'EOF' ac_test can_ucbints '!' can_inttypes 1 "for UCB 32-bit integer types" <<-'EOF'
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h> #include <stddef.h>
int main(int ac, char **av) { return ((u_int32_t)(ptrdiff_t)*av + (int32_t)ac); } int main(int ac, char **av) { return ((u_int32_t)(size_t)*av + (int32_t)ac); }
EOF EOF
ac_test can_int8type '!' stdint_h 1 "for standard 8-bit integer type" <<-'EOF' ac_test can_int8type '!' stdint_h 1 "for standard 8-bit integer type" <<-'EOF'
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h> #include <stddef.h>
int main(int ac, char **av) { return ((uint8_t)(ptrdiff_t)av[ac]); } int main(int ac, char **av) { return ((uint8_t)(size_t)av[ac]); }
EOF EOF
ac_test can_ucbint8 '!' can_int8type 1 "for UCB 8-bit integer type" <<-'EOF' ac_test can_ucbint8 '!' can_int8type 1 "for UCB 8-bit integer type" <<-'EOF'
#include <sys/types.h> #include <sys/types.h>
#include <stddef.h> #include <stddef.h>
int main(int ac, char **av) { return ((u_int8_t)(ptrdiff_t)av[ac]); } int main(int ac, char **av) { return ((u_int8_t)(size_t)av[ac]); }
EOF EOF
ac_test rlim_t <<-'EOF' ac_test rlim_t <<-'EOF'
@@ -1784,7 +1784,7 @@ else
#define EXTERN #define EXTERN
#define MKSH_INCLUDES_ONLY #define MKSH_INCLUDES_ONLY
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.669 2014/10/07 15:22:12 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.670 2014/11/25 20:00:36 tg Exp $");
int main(void) { printf("Hello, World!\n"); return (isatty(0)); } int main(void) { printf("Hello, World!\n"); return (isatty(0)); }
EOF EOF
case $cm in case $cm in
@@ -1969,13 +1969,13 @@ EOF
ac_test setlocale_ctype '' 'setlocale(LC_CTYPE, "")' <<-'EOF' ac_test setlocale_ctype '' 'setlocale(LC_CTYPE, "")' <<-'EOF'
#include <locale.h> #include <locale.h>
#include <stddef.h> #include <stddef.h>
int main(void) { return ((int)(ptrdiff_t)(void *)setlocale(LC_CTYPE, "")); } int main(void) { return ((int)(size_t)(void *)setlocale(LC_CTYPE, "")); }
EOF EOF
ac_test langinfo_codeset setlocale_ctype 0 'nl_langinfo(CODESET)' <<-'EOF' ac_test langinfo_codeset setlocale_ctype 0 'nl_langinfo(CODESET)' <<-'EOF'
#include <langinfo.h> #include <langinfo.h>
#include <stddef.h> #include <stddef.h>
int main(void) { return ((int)(ptrdiff_t)(void *)nl_langinfo(CODESET)); } int main(void) { return ((int)(size_t)(void *)nl_langinfo(CODESET)); }
EOF EOF
ac_test select <<-'EOF' ac_test select <<-'EOF'
@@ -2150,9 +2150,9 @@ cta(uari_has_32_bit, 0 < (mksh_uari_t)(((((mksh_uari_t)1 << 15) << 15) - 1) * 4
cta(uari_wrap_32_bit, cta(uari_wrap_32_bit,
(mksh_uari_t)(((((mksh_uari_t)1 << 15) << 15) - 1) * 4 + 3) > (mksh_uari_t)(((((mksh_uari_t)1 << 15) << 15) - 1) * 4 + 3) >
(mksh_uari_t)(((((mksh_uari_t)1 << 15) << 15) - 1) * 4 + 4)); (mksh_uari_t)(((((mksh_uari_t)1 << 15) << 15) - 1) * 4 + 4));
#define NUM 22 #define NUM 21
#else #else
#define NUM 16 #define NUM 15
#endif #endif
/* these are always required */ /* these are always required */
cta(ari_is_signed, (mksh_ari_t)-1 < (mksh_ari_t)0); cta(ari_is_signed, (mksh_ari_t)-1 < (mksh_ari_t)0);
@@ -2161,11 +2161,10 @@ cta(uari_is_unsigned, (mksh_uari_t)-1 > (mksh_uari_t)0);
cta(ari_size_no_matter_of_signedness, sizeof(mksh_ari_t) == sizeof(mksh_uari_t)); cta(ari_size_no_matter_of_signedness, sizeof(mksh_ari_t) == sizeof(mksh_uari_t));
cta(sizet_size_no_matter_of_signedness, sizeof(ssize_t) == sizeof(size_t)); cta(sizet_size_no_matter_of_signedness, sizeof(ssize_t) == sizeof(size_t));
cta(ptrdifft_sizet_same_size, sizeof(ptrdiff_t) == sizeof(size_t)); cta(sizet_voidptr_same_size, sizeof(size_t) == sizeof(void *));
cta(ptrdifft_voidptr_same_size, sizeof(ptrdiff_t) == sizeof(void *)); cta(sizet_funcptr_same_size, sizeof(size_t) == sizeof(void (*)(void)));
cta(ptrdifft_funcptr_same_size, sizeof(ptrdiff_t) == sizeof(void (*)(void)));
/* our formatting routines assume this */ /* our formatting routines assume this */
cta(ptr_fits_in_long, sizeof(ptrdiff_t) <= sizeof(long)); cta(ptr_fits_in_long, sizeof(size_t) <= sizeof(long));
/* for struct alignment people */ /* for struct alignment people */
char padding[64 - NUM]; char padding[64 - NUM];
}; };

4
funcs.c
View File

@@ -38,7 +38,7 @@
#endif #endif
#endif #endif
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.259 2014/10/12 21:58:51 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.260 2014/11/25 20:00:37 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@@ -1817,7 +1817,7 @@ c_read(const char **wp)
char *cp, *allocd = NULL, *xp; char *cp, *allocd = NULL, *xp;
const char *ccp; const char *ccp;
XString xs; XString xs;
ptrdiff_t xsave = 0; size_t xsave = 0;
mksh_ttyst tios; mksh_ttyst tios;
bool restore_tios = false; bool restore_tios = false;
#if HAVE_SELECT #if HAVE_SELECT

6
histrap.c
View File

@@ -27,7 +27,7 @@
#include <sys/file.h> #include <sys/file.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.134 2014/06/09 13:25:53 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/histrap.c,v 1.135 2014/11/25 20:00:38 tg Exp $");
Trap sigtraps[NSIG + 1]; Trap sigtraps[NSIG + 1];
static struct sigaction Sigact_ign; static struct sigaction Sigact_ign;
@@ -423,14 +423,14 @@ hist_get(const char *str, bool approx, bool allow_cur)
if (getn(str, &n)) { if (getn(str, &n)) {
hp = histptr + (n < 0 ? n : (n - hist_source->line)); hp = histptr + (n < 0 ? n : (n - hist_source->line));
if ((ptrdiff_t)hp < (ptrdiff_t)history) { if ((size_t)hp < (size_t)history) {
if (approx) if (approx)
hp = hist_get_oldest(); hp = hist_get_oldest();
else { else {
bi_errorf("%s: %s", str, Tnot_in_history); bi_errorf("%s: %s", str, Tnot_in_history);
hp = NULL; hp = NULL;
} }
} else if ((ptrdiff_t)hp > (ptrdiff_t)histptr) { } else if ((size_t)hp > (size_t)histptr) {
if (approx) if (approx)
hp = hist_get_newest(allow_cur); hp = hist_get_newest(allow_cur);
else { else {

6
lalloc.c
View File

@@ -1,5 +1,5 @@
/*- /*-
* Copyright (c) 2009, 2010, 2011, 2013 * Copyright (c) 2009, 2010, 2011, 2013, 2014
* Thorsten Glaser <tg@mirbsd.org> * Thorsten Glaser <tg@mirbsd.org>
* *
* Provided that these terms and disclaimer and all copyright notices * Provided that these terms and disclaimer and all copyright notices
@@ -20,7 +20,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/lalloc.c,v 1.20 2013/06/03 22:28:33 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/lalloc.c,v 1.21 2014/11/25 20:00:39 tg Exp $");
/* build with CPPFLAGS+= -DUSE_REALLOC_MALLOC=0 on ancient systems */ /* build with CPPFLAGS+= -DUSE_REALLOC_MALLOC=0 on ancient systems */
#if defined(USE_REALLOC_MALLOC) && (USE_REALLOC_MALLOC == 0) #if defined(USE_REALLOC_MALLOC) && (USE_REALLOC_MALLOC == 0)
@@ -29,7 +29,7 @@ __RCSID("$MirOS: src/bin/mksh/lalloc.c,v 1.20 2013/06/03 22:28:33 tg Exp $");
#define remalloc(p,n) realloc_osi((p), (n)) #define remalloc(p,n) realloc_osi((p), (n))
#endif #endif
#define ALLOC_ISUNALIGNED(p) (((ptrdiff_t)(p)) % ALLOC_SIZE) #define ALLOC_ISUNALIGNED(p) (((size_t)(p)) % ALLOC_SIZE)
static ALLOC_ITEM *findptr(ALLOC_ITEM **, char *, Area *); static ALLOC_ITEM *findptr(ALLOC_ITEM **, char *, Area *);

5
misc.c
View File

@@ -30,7 +30,7 @@
#include <grp.h> #include <grp.h>
#endif #endif
__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.219 2014/01/05 21:57:27 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/misc.c,v 1.220 2014/11/25 20:00:39 tg Exp $");
#define KSH_CHVT_FLAG #define KSH_CHVT_FLAG
#ifdef MKSH_SMALL #ifdef MKSH_SMALL
@@ -1384,8 +1384,7 @@ do_realpath(const char *upath)
{ {
char *xp, *ip, *tp, *ipath, *ldest = NULL; char *xp, *ip, *tp, *ipath, *ldest = NULL;
XString xs; XString xs;
ptrdiff_t pos; size_t pos, len;
size_t len;
int llen; int llen;
struct stat sb; struct stat sb;
#ifdef MKSH__NO_PATH_MAX #ifdef MKSH__NO_PATH_MAX