X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=filebrowser%2Fselfile.c;h=91f39a9e1071f9f09fc72fa158bfeb7e4d5beaa9;hb=a8a8324fc365e51b7e93fb09571e90b6abb3a7d8;hp=4298e3068ffd1aa739b34ca957b77c7486e6dd59;hpb=373488935bf19680e26a3b51e617c9586dd438c6;p=xboard.git diff --git a/filebrowser/selfile.c b/filebrowser/selfile.c index 4298e30..91f39a9 100644 --- a/filebrowser/selfile.c +++ b/filebrowser/selfile.c @@ -588,15 +588,16 @@ SFopenFile(name, mode, prompt, failed) return fp; } +void SFtextChanged() { if ((SFtextBuffer[0] == '/') || (SFtextBuffer[0] == '~')) { - (void) strcpy(SFcurrentPath, SFtextBuffer); + (void) strncpy(SFcurrentPath, SFtextBuffer, MAXPATHLEN); SFtextPos = XawTextGetInsertionPoint(selFileField); } else { - (void) strcat(strcpy(SFcurrentPath, SFstartDir), SFtextBuffer); + (void) strcat(strncpy(SFcurrentPath, SFstartDir, MAXPATHLEN), SFtextBuffer); SFtextPos = XawTextGetInsertionPoint(selFileField) + strlen(SFstartDir); @@ -608,6 +609,7 @@ SFtextChanged() } SFupdatePath(); + return; } static char * @@ -617,7 +619,7 @@ SFgetText() SFtextBuffer); } -static +static void SFprepareToReturn() { SFstatus = SEL_FILE_NULL; @@ -630,6 +632,7 @@ SFprepareToReturn() "XsraSelFile: can't return to current directory" ); } + return; } FILE * @@ -694,11 +697,11 @@ XsraSelFile(toplevel, prompt, ok, cancel, failed, XtAppError(SFapp, "XsraSelFile: can't get current directory"); } (void) strcat(SFstartDir, "/"); - (void) strcpy(SFcurrentDir, SFstartDir); + (void) strncpy(SFcurrentDir, SFstartDir, MAXPATHLEN); if (init_path) { if (init_path[0] == '/') { - (void) strcpy(SFcurrentPath, init_path); + (void) strncpy(SFcurrentPath, init_path, MAXPATHLEN); if (strncmp( SFcurrentPath, SFstartDir, @@ -709,12 +712,12 @@ XsraSelFile(toplevel, prompt, ok, cancel, failed, SFsetText(&(SFcurrentPath[strlen(SFstartDir)])); } } else { - (void) strcat(strcpy(SFcurrentPath, SFstartDir), + (void) strcat(strncpy(SFcurrentPath, SFstartDir, MAXPATHLEN), init_path); SFsetText(&(SFcurrentPath[strlen(SFstartDir)])); } } else { - (void) strcpy(SFcurrentPath, SFstartDir); + (void) strncpy(SFcurrentPath, SFstartDir, MAXPATHLEN); } SFfunc = show_entry;