Changeset 123 for trunk/dll/dircnrs.c

Timestamp:

Dec 5, 2004, 1:20:19 AM (21 years ago)

Author:

root

Message:

Rework lstrip/rstrip usage

File:

• trunk/dll/dircnrs.c (modified) (4 diffs)

trunk/dll/dircnrs.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2002 Steven H.Levine
-
-  Revisions     16 Oct 02 SHL - Handle large partitions
+  Copyright (c) 2001, 2004 Steven H.Levine
+
+  Revisions     16 Oct 02 SHL Handle large partitions
+                01 Aug 04 SHL Rework lstrip/rstrip usage
 
 ***********************************************************************/
@@ -1168 +1169 @@
 MRESULT EXPENTRY DirCnrWndProc (HWND hwnd,ULONG msg,MPARAM mp1,MPARAM mp2) {
 
+  ULONG ulrc;
   DIRCNRDATA *dcd = WinQueryWindowPtr(hwnd,0);
 
@@ -1939 +1941 @@
               sip.ret = filename;
               sip.title = GetPString(IDS_CREATETITLETEXT);
-              if(WinDlgBox(HWND_DESKTOP,hwnd,InputDlgProc,FM3ModHandle,
-                           STR_FRAME,&sip) && *(lstrip(rstrip(sip.ret)))) {
-
-                CHAR      newfile[CCHMAXPATH];
-                FILE     *fp;
-                INT       test;
-                PCNRITEM  pci;
-
-                strcpy(newfile,dcd->directory);
-                if(newfile[strlen(newfile) - 1] != '\\')
-                  strcat(newfile,"\\");
-                strcat(newfile,sip.ret);
-                test = IsFile(newfile);
-                if(test != 1)
-                  fp = fopen(newfile,"w");
-                if(test == 1 || fp) {
-                  if(fp) {
-                    WinSendMsg(hwnd,
-                               UM_UPDATERECORD,
-                               MPFROMP(newfile),
-                               MPVOID);
-                    fclose(fp);
-                  }
-                  if(*editor) {
-
-                    CHAR *dummy[2];
-
-                    dummy[0] = newfile;
-                    dummy[1] = NULL;
-                    ExecOnList(hwnd,
-                               editor,
-                               WINDOWED | SEPARATE,
-                               NULL,
-                               dummy,
-                               NULL);
+              if (WinDlgBox(HWND_DESKTOP,hwnd,InputDlgProc,FM3ModHandle,
+                           STR_FRAME,&sip))
+             {
+                bstrip(sip.ret);
+                if (*sip.ret)
+                {
+
+                  CHAR      newfile[CCHMAXPATH];
+                  FILE     *fp;
+                  INT       test;
+                  PCNRITEM  pci;
+
+                  strcpy(newfile,dcd->directory);
+                  if(newfile[strlen(newfile) - 1] != '\\')
+                    strcat(newfile,"\\");
+                  strcat(newfile,sip.ret);
+                  test = IsFile(newfile);
+                  if(test != 1)
+                    fp = fopen(newfile,"w");
+                  if(test == 1 || fp) {
+                    if(fp) {
+                      WinSendMsg(hwnd,
+                                 UM_UPDATERECORD,
+                                 MPFROMP(newfile),
+                                 MPVOID);
+                      fclose(fp);
+                    }
+                    if(*editor) {
+
+                      CHAR *dummy[2];
+
+                      dummy[0] = newfile;
+                      dummy[1] = NULL;
+                      ExecOnList(hwnd,
+                                 editor,
+                                 WINDOWED | SEPARATE,
+                                 NULL,
+                                 dummy,
+                                 NULL);
+                    }
+                    else
+                      StartMLEEditor(dcd->hwndParent,
+                                     4,
+                                     newfile,
+                                     dcd->hwndFrame);
+                    pci = FindCnrRecord(hwnd,
+                                        newfile,
+                                        NULL,
+                                        TRUE,
+                                        FALSE,
+                                        TRUE);
+                    if(pci && (INT)pci != -1)
+                      /* make sure that record shows in viewport */
+                      ShowCnrRecord(hwnd,(PMINIRECORDCORE)pci);
                   }
                   else
-                    StartMLEEditor(dcd->hwndParent,
-                                   4,
-                                   newfile,
-                                   dcd->hwndFrame);
-                  pci = FindCnrRecord(hwnd,
-                                      newfile,
-                                      NULL,
-                                      TRUE,
-                                      FALSE,
-                                      TRUE);
-                  if(pci && (INT)pci != -1)
-                    /* make sure that record shows in viewport */
-                    ShowCnrRecord(hwnd,(PMINIRECORDCORE)pci);
-                }
-                else
-                  saymsg(MB_ENTER,
-                         hwnd,
-                         GetPString(IDS_ERRORTEXT),
-                         GetPString(IDS_CREATEERRORTEXT),
-                         newfile);
+                    saymsg(MB_ENTER,
+                           hwnd,
+                           GetPString(IDS_ERRORTEXT),
+                           GetPString(IDS_CREATEERRORTEXT),
+                           newfile);
+                }
               }
             }
@@ -3401 +3408 @@
                 if(p)
                   *p = 0;
-                lstrip(rstrip(szData));
+                bstrip(szData);
                 if(*szData) {
                   if(!DosQueryPathInfo(szData,