mars_nwe/mars-tinyldap
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove obsolete ldap_match (superseded by ldap_match_mapped a long time ago)

Browse Source 
make mstorage_add compile on non-Linux
This commit is contained in:
leitner
2002-09-07 11:16:14 +00:00
parent b7f37ce357
commit b1960800b8
3 changed files with 22 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
mstorage_add.c
View File

@@ -14,32 +14,43 @@
#define PAGEMASK ((PAGE_SIZE)-1)
/* Sadly, mremap is only available on Linux */
/* Please petition your congressman^Woperating system vendor to include it! */
long mstorage_add(mstorage_t* p,const char* s,unsigned long n) {
if (p->mapped-p->used<n) {
if (!p->root) {
/* nothing allocated. mmap /dev/zero */
#ifndef MAP_ANONYMOUS
int fd=open("/dev/zero",O_RDWR);
#endif
char* tmp;
long need=(n|PAGEMASK)+1;
#ifdef MREMAP_MAYMOVE
#ifdef MAP_ANONYMOUS
if ((tmp=mmap(0,need,PROT_READ|PROT_WRITE,MAP_PRIVATE|MAP_ANONYMOUS,-1,0))==MAP_FAILED)
#else
if (fd<0) return -1;
if ((tmp=mmap(0,need,PROT_READ|PROT_WRITE,MAP_PRIVATE,fd,0))==MAP_FAILED)
#endif
return -1;
#else
int fd=open("/dev/zero",O_RDWR);
if (fd<0) return -1;
tmp=mmap(0,need,PROT_READ|PROT_WRITE,MAP_PRIVATE,fd,0);
close(fd);
if (tmp==MAP_FAILED)
return -1;
#endif
#else
if (!(tmp=malloc(need)))
return -1;
#endif
p->root=tmp;
p->mapped=need;
p->used=0;
#ifndef MAP_ANONYMOUS
close(fd);
#endif
} else {
long need=((p->used+n)|PAGEMASK)+1;
#ifdef MREMAP_MAYMOVE
char* tmp=mremap(p->root,p->mapped,need,MREMAP_MAYMOVE);
if (tmp==MAP_FAILED) return -1;
#else
char* tmp=realloc(p->root,need);
if (!tmp) return -1;
#endif
p->mapped=need; p->root=tmp;
}
}