nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-04 21:12:47 -05:00
Code Issues Projects Releases Wiki Activity

Giant const-correctness patch of doom!

Browse Source 
Having found a lot of unfixed constness issues in recent development,
I thought perhaps it was time to get proactive, so I compiled the
whole codebase with -Wwrite-strings. That turned up a huge load of
const problems, which I've fixed in this commit: the Unix build now
goes cleanly through with -Wwrite-strings, and the Windows build is as
close as I could get it (there are some lingering issues due to
occasional Windows API functions like AcquireCredentialsHandle not
having the right constness).

Notable fallout beyond the purely mechanical changing of types:
 - the stuff saved by cmdline_save_param() is now explicitly
   dupstr()ed, and freed in cmdline_run_saved.
 - I couldn't make both string arguments to cmdline_process_param()
   const, because it intentionally writes to one of them in the case
   where it's the argument to -pw (in the vain hope of being at least
   slightly friendly to 'ps'), so elsewhere I had to temporarily
   dupstr() something for the sake of passing it to that function
 - I had to invent a silly parallel version of const_cmp() so I could
   pass const string literals in to lookup functions.
 - stripslashes() in pscp.c and psftp.c has the annoying strchr nature
This commit is contained in:
Simon Tatham
2015-05-15 11:15:42 +01:00
parent fb4fbe1158
commit 89da2ddf56
65 changed files with 559 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
windows/winsftp.c
View File

@ -11,7 +11,7 @@
char *get_ttymode(void *frontend, const char *mode) { return NULL; }
int get_userpass_input(prompts_t *p, unsigned char *in, int inlen)
int get_userpass_input(prompts_t *p, const unsigned char *in, int inlen)
{
int ret;
ret = cmdline_get_passwd_input(p, in, inlen);
@ -87,7 +87,7 @@ struct RFile {
HANDLE h;
};
RFile *open_existing_file(char *name, uint64 *size,
RFile *open_existing_file(const char *name, uint64 *size,
unsigned long *mtime, unsigned long *atime,
long *perms)
{
@ -141,7 +141,7 @@ struct WFile {
HANDLE h;
};
WFile *open_new_file(char *name, long perms)
WFile *open_new_file(const char *name, long perms)
{
HANDLE h;
WFile *ret;
@ -157,7 +157,7 @@ WFile *open_new_file(char *name, long perms)
return ret;
}
WFile *open_existing_wfile(char *name, uint64 *size)
WFile *open_existing_wfile(const char *name, uint64 *size)
{
HANDLE h;
WFile *ret;
@ -239,7 +239,7 @@ uint64 get_file_posn(WFile *f)
return ret;
}
int file_type(char *name)
int file_type(const char *name)
{
DWORD attr;
attr = GetFileAttributes(name);
@ -257,7 +257,7 @@ struct DirHandle {
char *name;
};
DirHandle *open_directory(char *name)
DirHandle *open_directory(const char *name)
{
HANDLE h;
WIN32_FIND_DATA fdat;
@ -316,7 +316,7 @@ void close_directory(DirHandle *dir)
sfree(dir);
}
int test_wildcard(char *name, int cmdline)
int test_wildcard(const char *name, int cmdline)
{
HANDLE fh;
WIN32_FIND_DATA fdat;
@ -364,7 +364,7 @@ static char *stripslashes(char *str, int local)
return str;
}
WildcardMatcher *begin_wildcard_matching(char *name)
WildcardMatcher *begin_wildcard_matching(const char *name)
{
HANDLE h;
WIN32_FIND_DATA fdat;
@ -424,7 +424,7 @@ void finish_wildcard_matching(WildcardMatcher *dir)
sfree(dir);
}
int vet_filename(char *name)
int vet_filename(const char *name)
{
if (strchr(name, '/') || strchr(name, '\\') || strchr(name, ':'))
return FALSE;
@ -435,12 +435,12 @@ int vet_filename(char *name)
return TRUE;
}
int create_directory(char *name)
int create_directory(const char *name)
{
return CreateDirectory(name, NULL) != 0;
}
char *dir_file_cat(char *dir, char *file)
char *dir_file_cat(const char *dir, const char *file)
{
return dupcat(dir, "\\", file, NULL);
}
@ -691,7 +691,7 @@ static DWORD WINAPI command_read_thread(void *param)
return 0;
}
char *ssh_sftp_get_cmdline(char *prompt, int no_fds_ok)
char *ssh_sftp_get_cmdline(const char *prompt, int no_fds_ok)
{
int ret;
struct command_read_ctx actx, *ctx = &actx;