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

• remove strcasestr.c, use home-grown implementation¹, call it stricmp,

Browse Source 
and have it return an API-correct const char *
• enhance and stylify comments
• a little KNF and simplifications
• #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr
  that take and return a non-const char *, and fix the violations
• new cstrchr, cstrstr (take and give const char *)
• new vstrchr, vstrstr (take const or not, give boolean value)
• new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP)
• new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-")
• replace the only use of strrchr with inlined code to shrink
• minor man page fixes
• Minix 3 signames are autogenerated with gcc
• rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway,
  only strlcpy(3), and shorten it
• dot.mkshrc: move MKSH=… down to the export line
  to not disturb the PS1 visual impression ☺
• dot.mkshrc: Lstripcom(): optimise
• bump version

¹) side effect from creating API-correct cstrchr, cstrstr, etc.
   uses goto so it must be better ☻

tested on mirbsd-current via both Makefile and Build.sh
This commit is contained in:
tg
2007-03-04 03:04:28 +00:00
parent 62b347a1b0
commit 83c2ee87f4
25 changed files with 332 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
alloc.c
View File

@ -29,7 +29,7 @@
#include "sh.h"
__RCSID("$MirOS: src/bin/mksh/alloc.c,v 1.3 2005/11/22 18:40:40 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/alloc.c,v 1.4 2007/03/04 03:04:23 tg Exp $");
struct link {
struct link *prev;
@ -40,7 +40,7 @@ Area *
ainit(Area *ap)
{
ap->freelist = NULL;
return ap;
return (ap);
}
void
@ -55,16 +55,15 @@ afreeall(Area *ap)
ap->freelist = NULL;
}
#define L2P(l) ( (void *)(((char *)(l)) + sizeof(struct link)) )
#define P2L(p) ( (struct link *)(((char *)(p)) - sizeof(struct link)) )
#define L2P(l) ( (void *)(((char *)(l)) + sizeof (struct link)) )
#define P2L(p) ( (struct link *)(((char *)(p)) - sizeof (struct link)) )
void *
alloc(size_t size, Area *ap)
{
struct link *l;
l = malloc(sizeof(struct link) + size);
if (l == NULL)
if ((l = malloc(sizeof (struct link) + size)) == NULL)
internal_errorf(1, "unable to allocate memory");
l->next = ap->freelist;
l->prev = NULL;
@ -72,7 +71,7 @@ alloc(size_t size, Area *ap)
ap->freelist->prev = l;
ap->freelist = l;
return L2P(l);
return (L2P(l));
}
void *
@ -81,14 +80,13 @@ aresize(void *ptr, size_t size, Area *ap)
struct link *l, *l2, *lprev, *lnext;
if (ptr == NULL)
return alloc(size, ap);
return (alloc(size, ap));
l = P2L(ptr);
lprev = l->prev;
lnext = l->next;
l2 = realloc(l, sizeof(struct link) + size);
if (l2 == NULL)
if ((l2 = realloc(l, sizeof (struct link) + size)) == NULL)
internal_errorf(1, "unable to allocate memory");
if (lprev)
lprev->next = l2;
@ -97,7 +95,7 @@ aresize(void *ptr, size_t size, Area *ap)
if (lnext)
lnext->prev = l2;
return L2P(l2);
return (L2P(l2));
}
void