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

Cygwin: utils: change 3rd readlink param to size_t

Browse Source 
Avoid gcc warnings

Signed-off-by: Corinna Vinschen <corinna@vinschen.de>
This commit is contained in:
Corinna Vinschen
2018-08-08 09:25:12 +02:00
parent 13909bc262
commit 37f4fea07c
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/utils/path.cc
View File

@@ -181,7 +181,7 @@ out:
/* Assumes is_symlink(fh) is true */
bool
readlink (HANDLE fh, char *path, int maxlen)
readlink (HANDLE fh, char *path, size_t maxlen)
{
DWORD rv;
char *buf, *cp;
@@ -225,7 +225,7 @@ readlink (HANDLE fh, char *path, int maxlen)
return false;
wcstombs (path, (wchar_t *) (cp + 2), wlen + 1);
}
else if (len + 1 > maxlen)
else if ((size_t) (len + 1) > maxlen)
return false;
else
memcpy (path, cp, len);
@@ -243,7 +243,7 @@ readlink (HANDLE fh, char *path, int maxlen)
return false;
wcstombs (path, (wchar_t *) (cp + 2), wlen + 1);
}
else if (fi.nFileSizeLow - strlen (SYMLINK_COOKIE) > (unsigned) maxlen)
else if (fi.nFileSizeLow - strlen (SYMLINK_COOKIE) > maxlen)
return false;
else
strcpy (path, cp);
@@ -778,7 +778,7 @@ rel_vconcat (const char *cwd, const char *s, va_list v)
cwd = pathbuf;
}
int max_len = 0;
size_t max_len = 0;
mnt_t *m, *match = NULL;
for (m = mount_table; m->posix; m++)

2
winsup/utils/path.h
View File

@@ -17,7 +17,7 @@ char *cygpath (const char *s, ...);
char *cygpath_rel (const char *cwd, const char *s, ...);
bool is_exe (HANDLE);
bool is_symlink (HANDLE);
bool readlink (HANDLE, char *, int);
bool readlink (HANDLE, char *, size_t);
int get_word (HANDLE, int);
int get_dword (HANDLE, int);
bool from_fstab_line (mnt_t *m, char *line, bool user);