[ESRG-CVS] sfesrg/esrgpcpj/gfsw gfsw.c,1.25,1.26

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/esrg/sfesrg/esrgpcpj/gfsw
In directory sfp-cvsdas-1.v30.ch3.sourceforge.com:/tmp/cvs-serv31242

Modified Files:
	gfsw.c 
Log Message:
Warnings from newer version of Visual Studio addressed.


Index: gfsw.c
===================================================================
RCS file: /cvsroot/esrg/sfesrg/esrgpcpj/gfsw/gfsw.c,v
retrieving revision 1.25
retrieving revision 1.26
diff -C2 -d -r1.25 -r1.26
*** gfsw.c	24 Jun 2002 05:01:12 -0000	1.25
--- gfsw.c	27 Nov 2009 22:30:37 -0000	1.26
***************
*** 392,400 ****
           }
        }
!    sprintf(buf, "Files to signature:  %d.\x0d\x0a", nfiles);
     len = strlen(buf);
     if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
        {
!       strcpy(GFSW_dispbuf+dispbufidx, buf);
        dispbufidx += len;
        }
--- 392,400 ----
           }
        }
!    sprintf_s(buf, sizeof(buf), "Files to signature:  %d.\x0d\x0a", nfiles);
     len = strlen(buf);
     if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
        {
!       strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf) - dispbufidx,buf);
        dispbufidx += len;
        }
***************
*** 405,421 ****
        if ((GFSW_file_info.file_info[i].fpath[0]) && (GFSW_file_info.file_info[i].is_directory_valid))
           {
!          sprintf(buf, "--------------------\x0d\x0a");
           len = strlen(buf);
           if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
              {
!             strcpy(GFSW_dispbuf+dispbufidx, buf);
              dispbufidx += len;
              }
  
!          sprintf(buf, "[%03d/%03d] %s\x0d\x0a", i+1, nfiles, GFSW_file_info.file_info[i].fpath);
           len = strlen(buf);
           if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
              {
!             strcpy(GFSW_dispbuf+dispbufidx, buf);
              dispbufidx += len;
              }
--- 405,421 ----
        if ((GFSW_file_info.file_info[i].fpath[0]) && (GFSW_file_info.file_info[i].is_directory_valid))
           {
!          sprintf_s(buf, sizeof(buf), "--------------------\x0d\x0a");
           len = strlen(buf);
           if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
              {
!             strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
              dispbufidx += len;
              }
  
!          sprintf_s(buf, sizeof(buf), "[%03d/%03d] %s\x0d\x0a", i+1, nfiles, GFSW_file_info.file_info[i].fpath);
           len = strlen(buf);
           if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
              {
!             strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
              dispbufidx += len;
              }
***************
*** 425,433 ****
           if (GFSW_file_info.file_info[i].is_directory_error)
              {
!             sprintf(buf, "\tError obtaining file attributes--cannot process this file.\x0d\x0a");
              len = strlen(buf);
              if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                 {
!                strcpy(GFSW_dispbuf+dispbufidx, buf);
                 dispbufidx += len;
                 }
--- 425,433 ----
           if (GFSW_file_info.file_info[i].is_directory_error)
              {
!             sprintf_s(buf, sizeof(buf), "\tError obtaining file attributes--cannot process this file.\x0d\x0a");
              len = strlen(buf);
              if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                 {
!                strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
                 dispbufidx += len;
                 }
***************
*** 435,443 ****
           else if (GFSW_file_info.file_info[i].is_directory)
              {
!             sprintf(buf, "\tThis item is a directory and will not be signatured.\x0d\x0a");
              len = strlen(buf);
              if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                 {
!                strcpy(GFSW_dispbuf+dispbufidx, buf);
                 dispbufidx += len;
                 }
--- 435,443 ----
           else if (GFSW_file_info.file_info[i].is_directory)
              {
!             sprintf_s(buf, sizeof(buf), "\tThis item is a directory and will not be signatured.\x0d\x0a");
              len = strlen(buf);
              if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                 {
!                strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
                 dispbufidx += len;
                 }
***************
*** 454,465 ****
  
                 buf2[0] = 0;  //Just in case conversion doesn't go right.
!                sprintf(buf2, "%I64u", GFSW_file_info.file_info[i].file_size);
                 BSTRFUNC_commanate(buf2);
!                sprintf(buf, "\tSize:\t%s\x0d\x0a", buf2);
  
                 len = strlen(buf);
                 if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                    {
!                   strcpy(GFSW_dispbuf+dispbufidx, buf);
                    dispbufidx += len;
                    }
--- 454,465 ----
  
                 buf2[0] = 0;  //Just in case conversion doesn't go right.
!                sprintf_s(buf2, sizeof(buf2), "%I64u", GFSW_file_info.file_info[i].file_size);
                 BSTRFUNC_commanate(buf2);
!                sprintf_s(buf, sizeof(buf), "\tSize:\t%s\x0d\x0a", buf2);
  
                 len = strlen(buf);
                 if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                    {
!                   strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
                    dispbufidx += len;
                    }
***************
*** 469,477 ****
              if (GFSW_file_info.file_info[i].crc32_valid)
                 {
!                sprintf(buf, "\tCRC-32:\t%s\x0d\x0a", GFSW_file_info.file_info[i].crc32);
                 len = strlen(buf);
                 if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                    {
!                   strcpy(GFSW_dispbuf+dispbufidx, buf);
                    dispbufidx += len;
                    }
--- 469,477 ----
              if (GFSW_file_info.file_info[i].crc32_valid)
                 {
!                sprintf_s(buf, sizeof(buf), "\tCRC-32:\t%s\x0d\x0a", GFSW_file_info.file_info[i].crc32);
                 len = strlen(buf);
                 if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                    {
!                   strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
                    dispbufidx += len;
                    }
***************
*** 481,489 ****
              if (GFSW_file_info.file_info[i].md5_valid)
                 {
!                sprintf(buf, "\tMD-5:\t%s\x0d\x0a", GFSW_file_info.file_info[i].md5);
                 len = strlen(buf);
                 if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                    {
!                   strcpy(GFSW_dispbuf+dispbufidx, buf);
                    dispbufidx += len;
                    }
--- 481,489 ----
              if (GFSW_file_info.file_info[i].md5_valid)
                 {
!                sprintf_s(buf, sizeof(buf), "\tMD-5:\t%s\x0d\x0a", GFSW_file_info.file_info[i].md5);
                 len = strlen(buf);
                 if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
                    {
!                   strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
                    dispbufidx += len;
                    }
***************
*** 502,514 ****
     if (GFSW_file_info.aborted)
        {
!       sprintf(buf, "-------------------- FILE SIGNATURE ABORTED --------------------");
        }
     else if (GFSW_file_info.terminated_normally)
        {
!       sprintf(buf, "-------------------- FILE SIGNATURE COMPLETE --------------------");
        }
     else
        {
!       sprintf(buf, "-------------------- FILE SIGNATURE IN PROGRESS -------------------");
        }
  
--- 502,514 ----
     if (GFSW_file_info.aborted)
        {
!       sprintf_s(buf, sizeof(buf), "-------------------- FILE SIGNATURE ABORTED --------------------");
        }
     else if (GFSW_file_info.terminated_normally)
        {
!       sprintf_s(buf, sizeof(buf), "-------------------- FILE SIGNATURE COMPLETE --------------------");
        }
     else
        {
!       sprintf_s(buf, sizeof(buf), "-------------------- FILE SIGNATURE IN PROGRESS -------------------");
        }
  
***************
*** 516,520 ****
     if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
        {
!       strcpy(GFSW_dispbuf+dispbufidx, buf);
        dispbufidx += len;
        }
--- 516,520 ----
     if ((len + dispbufidx + 2) < GFSW_DISPBUFLEN)
        {
!       strcpy_s(GFSW_dispbuf+dispbufidx, sizeof(GFSW_dispbuf)-dispbufidx, buf);
        dispbufidx += len;
        }
***************
*** 706,710 ****
                    if (!GFSW_dialog_file_open_buffer[srccharidx+1])
                       {
!                      strcpy((char *)GFSW_file_info.file_info[0].fpath, GFSW_dialog_file_open_buffer);
                       }
                    else
--- 706,710 ----
                    if (!GFSW_dialog_file_open_buffer[srccharidx+1])
                       {
!                      strcpy_s((char *)GFSW_file_info.file_info[0].fpath, sizeof(GFSW_file_info.file_info[0].fpath), GFSW_dialog_file_open_buffer);
                       }
                    else
***************
*** 716,720 ****
  
                          srccharidx++;
!                         strcpy((char *)GFSW_file_info.file_info[dstarridx].fpath, GFSW_dialog_file_open_buffer);
  
                          //Watch out for adding two backslashes.  This can happen if the path
--- 716,720 ----
  
                          srccharidx++;
!                         strcpy_s((char *)GFSW_file_info.file_info[dstarridx].fpath, sizeof(GFSW_file_info.file_info[dstarridx].fpath), GFSW_dialog_file_open_buffer);
  
                          //Watch out for adding two backslashes.  This can happen if the path
***************
*** 730,736 ****
                          else
                             {
!                            strcat((char *)GFSW_file_info.file_info[dstarridx].fpath, "\\");
                             }
!                         strcat((char *)GFSW_file_info.file_info[dstarridx].fpath, GFSW_dialog_file_open_buffer+srccharidx);
                          while (GFSW_dialog_file_open_buffer[srccharidx] != 0)
                             srccharidx++;
--- 730,736 ----
                          else
                             {
!                            strcat_s((char *)GFSW_file_info.file_info[dstarridx].fpath, sizeof(GFSW_file_info.file_info[dstarridx].fpath), "\\");
                             }
!                         strcat_s((char *)GFSW_file_info.file_info[dstarridx].fpath, sizeof(GFSW_file_info.file_info[dstarridx].fpath), GFSW_dialog_file_open_buffer+srccharidx);
                          while (GFSW_dialog_file_open_buffer[srccharidx] != 0)
                             srccharidx++;
***************
*** 828,834 ****
                 if (msg)
                    {
!                   strcpy(msg, first_line);
!                   strcat(msg, second_line);
!                   strcat(msg, BUILD_CONFIG_HelpAboutMsgIdString);
                    MessageBox (hwnd, 
                                msg, 
--- 828,834 ----
                 if (msg)
                    {
!                   strcpy_s(msg, strlen(first_line)+strlen(second_line)+strlen(BUILD_CONFIG_HelpAboutMsgIdString)+1,   first_line);
!                   strcat_s(msg, strlen(first_line)+strlen(second_line)+strlen(BUILD_CONFIG_HelpAboutMsgIdString)+1,   second_line);
!                   strcat_s(msg, strlen(first_line)+strlen(second_line)+strlen(BUILD_CONFIG_HelpAboutMsgIdString)+1,   BUILD_CONFIG_HelpAboutMsgIdString);
                    MessageBox (hwnd, 
                                msg, 
***************
*** 1046,1051 ****
           //even read the file for CRC-32 and MD5.  Just set info
           //and boogie.
!          strcpy((char *)GFSW_file_info.file_info[fidx].crc32, "INVALID FILE HANDLE");
!          strcpy((char *)GFSW_file_info.file_info[fidx].md5,   "INVALID FILE HANDLE");
           }
        else
--- 1046,1051 ----
           //even read the file for CRC-32 and MD5.  Just set info
           //and boogie.
!          strcpy_s((char *)GFSW_file_info.file_info[fidx].crc32, sizeof(GFSW_file_info.file_info[fidx].crc32), "INVALID FILE HANDLE");
!          strcpy_s((char *)GFSW_file_info.file_info[fidx].md5,   sizeof(GFSW_file_info.file_info[fidx].md5),   "INVALID FILE HANDLE");
           }
        else
***************
*** 1061,1066 ****
           if (rc == 0xFFFFFFFF)
              {
!             strcpy((char *)GFSW_file_info.file_info[fidx].crc32, "FILE SEEK ERROR");
!             strcpy((char *)GFSW_file_info.file_info[fidx].md5,   "FILE SEEK ERROR");
              goto file_read_loop_endpoint;
              }
--- 1061,1066 ----
           if (rc == 0xFFFFFFFF)
              {
!             strcpy_s((char *)GFSW_file_info.file_info[fidx].crc32, sizeof(GFSW_file_info.file_info[fidx].crc32), "FILE SEEK ERROR");
!             strcpy_s((char *)GFSW_file_info.file_info[fidx].md5,   sizeof(GFSW_file_info.file_info[fidx].md5),   "FILE SEEK ERROR");
              goto file_read_loop_endpoint;
              }
***************
*** 1088,1093 ****
              if (!rv)
                 {
!                strcpy((char *)GFSW_file_info.file_info[fidx].crc32, "FILE READ ERROR");
!                strcpy((char *)GFSW_file_info.file_info[fidx].md5,   "FILE READ ERROR");
                 goto file_read_loop_endpoint;
                 }
--- 1088,1093 ----
              if (!rv)
                 {
!                strcpy_s((char *)GFSW_file_info.file_info[fidx].crc32, sizeof(GFSW_file_info.file_info[fidx].crc32), "FILE READ ERROR");
!                strcpy_s((char *)GFSW_file_info.file_info[fidx].md5,   sizeof(GFSW_file_info.file_info[fidx].md5),   "FILE READ ERROR");
                 goto file_read_loop_endpoint;
                 }
***************
*** 1100,1105 ****
              else if (GFSW_thread_abort_request)
                 {
!                strcpy((char *)GFSW_file_info.file_info[fidx].crc32, "OPERATION ABORTED");
!                strcpy((char *)GFSW_file_info.file_info[fidx].md5,   "OPERATION ABORTED");
                 goto file_read_loop_endpoint;
                 }
--- 1100,1105 ----
              else if (GFSW_thread_abort_request)
                 {
!                strcpy_s((char *)GFSW_file_info.file_info[fidx].crc32, sizeof(GFSW_file_info.file_info[fidx].crc32), "OPERATION ABORTED");
!                strcpy_s((char *)GFSW_file_info.file_info[fidx].md5,   sizeof(GFSW_file_info.file_info[fidx].md5),   "OPERATION ABORTED");
                 goto file_read_loop_endpoint;
                 }
***************
*** 1116,1123 ****
  
           //Form up a CRC-32 string.
!          sprintf((char *)GFSW_file_info.file_info[fidx].crc32, "%8.8X", crc32);
  
           //Form up an MD-5 string.
!          strcpy((char *)GFSW_file_info.file_info[fidx].md5, md5r.md5_chars);
  
           //Report progress to parent thread.
--- 1116,1123 ----
  
           //Form up a CRC-32 string.
!          sprintf_s((char *)GFSW_file_info.file_info[fidx].crc32, sizeof(GFSW_file_info.file_info[fidx].crc32), "%8.8X", crc32);
  
           //Form up an MD-5 string.
!          strcpy_s((char *)GFSW_file_info.file_info[fidx].md5, sizeof(GFSW_file_info.file_info[fidx].md5), md5r.md5_chars);
  
           //Report progress to parent thread.
***************
*** 1147,1152 ****
           if (!close_result)
              {
!             strcpy((char *)GFSW_file_info.file_info[fidx].crc32, "FILE HANDLE CLOSE ERROR");
!             strcpy((char *)GFSW_file_info.file_info[fidx].md5,   "FILE HANDLE CLOSE ERROR");
              }
           }
--- 1147,1152 ----
           if (!close_result)
              {
!             strcpy_s((char *)GFSW_file_info.file_info[fidx].crc32, sizeof(GFSW_file_info.file_info[fidx].crc32), "FILE HANDLE CLOSE ERROR");
!             strcpy_s((char *)GFSW_file_info.file_info[fidx].md5,   sizeof(GFSW_file_info.file_info[fidx].md5),   "FILE HANDLE CLOSE ERROR");
              }
           }
***************
*** 1250,1253 ****
--- 1250,1256 ----
  /******************************************************************************
  ** $Log$
+ ** Revision 1.26  2009/11/27 22:30:37  dtashley
+ ** Warnings from newer version of Visual Studio addressed.
+ **
  ** Revision 1.25  2002/06/24 05:01:12  dtashley
  ** Additional documentation added for CreateFile() call.