buffer length. Don't terminate buffer with '\0'.
+2000-09-03 Egor Duda <deo@logos-m.ru>
+
+ * path.cc (readlink): Check if buffer length is positive.
+ Truncate output to buffer length. Don't terminate buffer
+ with '\0'.
+
Sun Sep 3 00:38:40 2000 Christopher Faylor <cgf@cygnus.com>
* environ.cc (environ_init): Don't free the new environment table after
int i;
for (i = 1; pfunc[i]; i++);
- for (int j = i - 1; j > 0; j-- )
+ for (int j = i - 1; j > 0; j--)
(pfunc[j]) ();
}
}
i = 0;
memset (&ep, 0, sizeof ep);
- for (; i < pids.npids; )
+ for (; i < pids.npids;)
{
DWORD thispid = pids[i++];
if (!thispid)
return cnt;
error:
- set_errno ( EINVAL );
+ set_errno (EINVAL);
return -1;
}
case DLL_THREAD_ATTACH:
if (user_data->threadinterface)
{
- if ( !TlsSetValue(user_data->threadinterface->reent_index,
+ if (!TlsSetValue(user_data->threadinterface->reent_index,
&user_data->threadinterface->reents))
api_fatal("Sig proc MT init failed\n");
}
/* Return default passwd entry if passwd is emulated or it's a
request for the current user. */
if (passwd_state != loaded
- || (! name && uid == myself->uid)
- || ( name && strcasematch(name, myself->username)))
+ || (!name && uid == myself->uid)
+ || (name && strcasematch(name, myself->username)))
return default_pw;
return NULL;
readlink (const char *path, char *buf, int buflen)
{
extern suffix_info stat_suffixes[];
+
+ if (buflen < 0)
+ {
+ set_errno (ENAMETOOLONG);
+ return -1;
+ }
+
path_conv pathbuf (path, PC_SYM_CONTENTS, stat_suffixes);
if (pathbuf.error)
return -1;
}
- int len = strlen (pathbuf.get_win32 ());
- if (len > (buflen - 1))
- {
- set_errno (ENAMETOOLONG);
- return -1;
- }
+ int len = max (buflen, (int) strlen (pathbuf.get_win32 ()));
memcpy (buf, pathbuf.get_win32 (), len);
- buf[len] = '\0';
/* errno set by symlink.check if error */
return len;
_pinfo::getsig(int sig)
{
#ifdef _MT_SAFE
- if ( thread2signal )
+ if (thread2signal)
return thread2signal->sigs[sig];
return sigs[sig];
#else
_pinfo::getsigmask ()
{
#ifdef _MT_SAFE
- if ( thread2signal )
+ if (thread2signal)
return *thread2signal->sigmask;
return sig_mask;
#else
_pinfo::setsigmask (sigset_t _mask)
{
#ifdef _MT_SAFE
- if ( thread2signal )
+ if (thread2signal)
*(thread2signal->sigmask) = _mask;
sig_mask=_mask;
#else
_pinfo::getsigtodo(int sig)
{
#ifdef _MT_SAFE
- if ( thread2signal )
+ if (thread2signal)
return thread2signal->sigtodo + __SIGOFFSET + sig;
return _sigtodo + __SIGOFFSET + sig;
#else
_pinfo::getthread2signal()
{
#ifdef _MT_SAFE
- if ( thread2signal )
+ if (thread2signal)
return thread2signal->win32_obj_id;
return hMainThread;
#else
if ((fdr = fdtab.find_unused_handle ()) < 0)
set_errno (ENMFILE);
else if ((fdw = fdtab.find_unused_handle (fdr + 1)) < 0)
- set_errno ( ENMFILE);
+ set_errno (ENMFILE);
else if (!CreatePipe (&r, &w, sa, psize))
__seterrno ();
else
int
pthread_equal (pthread_t t1, pthread_t t2)
{
- return __pthread_equal ( &t1, &t2);
+ return __pthread_equal (&t1, &t2);
}
/* Mutexes */
ciresrv.moreinfo->environ = (char **) cmalloc (HEAP_ARGV, envsize (envp, 1));
char **c;
const char * const *e;
- for (c = ciresrv.moreinfo->environ, e = envp; *e; )
+ for (c = ciresrv.moreinfo->environ, e = envp; *e;)
*c++ = cstrdup (*e++);
*c = NULL;
if (mode != _P_OVERLAY ||
&dwBytesWritten,
TRUE, // abort
FALSE, // don't process security
- &lpContext
- );
+ &lpContext);
}
else
syscall_printf ("cannot write streamId, %E");
if (fdtab.not_open (fd))
{
- set_errno ( EBADF);
+ set_errno (EBADF);
}
else
{
}
out:
- syscall_printf ("%d = tcsendbreak (%d, %d )", res, fd, duration);
+ syscall_printf ("%d = tcsendbreak (%d, %d)", res, fd, duration);
return res;
}
int
CmpPthreadObj (void *_i, void *_value)
{
- return ( (MTitem *) _i)->Id () == * (int *) _value;
+ return ((MTitem *) _i)->Id () == *(int *) _value;
};
int
CmpThreadId (void *_i, void *_id)
{
- return ( (ThreadItem *) _i)->thread_id == * (DWORD *) _id;
+ return ((ThreadItem *) _i)->thread_id == * (DWORD *) _id;
};
void