RepoMirrors/openssh
1
0
Fork 0
mirror of git://anongit.mindrot.org/openssh.git synced 2024-12-24 19:02:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

- (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and

Browse Source 
getcwd.c.
This commit is contained in:
Ben Lindstrom 2001-02-19 19:54:43 +00:00
parent 7387fdb6b5
commit 4ffaad8c33
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,7 @@
20010220
- (bal) Fix mixed up params to memmove() from Jan 5th in setenv.c and
getcwd.c.
20010219 20010219
- (bal) Markus' blessing to rename login.[ch] -> sshlogin.[ch] and - (bal) Markus' blessing to rename login.[ch] -> sshlogin.[ch] and
pty.[ch] -> sshpty.[ch] pty.[ch] -> sshpty.[ch]
@ -4070,4 +4074,4 @@
- Wrote replacements for strlcpy and mkdtemp - Wrote replacements for strlcpy and mkdtemp
- Released 1.0pre1 - Released 1.0pre1
$Id: ChangeLog,v 1.803 2001/02/19 10:51:49 djm Exp $ $Id: ChangeLog,v 1.804 2001/02/19 19:54:43 mouring Exp $

8
openbsd-compat/getcwd.c
View File

@ -119,7 +119,7 @@ getcwd(char *pt,size_t size)
* path to the beginning of the buffer, but it's always * path to the beginning of the buffer, but it's always
* been that way and stuff would probably break. * been that way and stuff would probably break.
*/ */
memmove(bpt, pt, ept - bpt); memmove(pt, bpt, ept - bpt);
free(up); free(up);
return (pt); return (pt);
} }
@ -170,7 +170,7 @@ getcwd(char *pt,size_t size)
goto notfound; goto notfound;
if (ISDOT(dp)) if (ISDOT(dp))
continue; continue;
memmove(dp->d_name, bup, dp->d_namlen + 1); memmove(bup, dp->d_name, dp->d_namlen + 1);
/* Save the first error for later. */ /* Save the first error for later. */
if (lstat(up, &s)) { if (lstat(up, &s)) {
@ -202,13 +202,13 @@ getcwd(char *pt,size_t size)
pt = npt; pt = npt;
bpt = pt + off; bpt = pt + off;
ept = pt + ptsize; ept = pt + ptsize;
memmove(bpt, ept - len, len); memmove(ept - len, bpt, len);
bpt = ept - len; bpt = ept - len;
} }
if (!first) if (!first)
*--bpt = '/'; *--bpt = '/';
bpt -= dp->d_namlen; bpt -= dp->d_namlen;
memmove(dp->d_name, bpt, dp->d_namlen); memmove(bpt, dp->d_name, dp->d_namlen);
(void)closedir(dir); (void)closedir(dir);
/* Truncate any file name. */ /* Truncate any file name. */

2
openbsd-compat/setenv.c
View File

@ -122,7 +122,7 @@ setenv(name, value, rewrite)
(cnt + 2))); (cnt + 2)));
if (!P) if (!P)
return (-1); return (-1);
memmove(environ, P, cnt * sizeof(char *)); memmove(P, environ, cnt * sizeof(char *));
environ = P; environ = P;
} }
environ[cnt + 1] = NULL; environ[cnt + 1] = NULL;