Changeset 486 for trunk/dll/uudecode.c

Timestamp:

Sep 7, 2006, 7:10:15 AM (19 years ago)

Author:

root

Message:

Back to fgets for now - avoid excess error messages

File:

• trunk/dll/uudecode.c (modified) (18 diffs)

trunk/dll/uudecode.c

@@ -13 +13 @@
   17 Jul 06 SHL Use Runtime_Error
   29 Jul 06 SHL Use xfgets
+  01 Sep 06 SHL Back to fgets for now - avoid excess error messages
 
 ***********************************************************************/
@@ -51 +52 @@
     dest = fakedest;
   in = _fsopen(filename, "r", SH_DENYWR);
-  if (!in)
-  {
+  if (!in) {
     saymsg(MB_CANCEL,
            HWND_DESKTOP,
@@ -62 +62 @@
 
   /* search for header line */
-  for (;;)
-  {
-    if (!xfgets(buf, sizeof(buf), in,pszSrcFile,__LINE__)) {
+  for (;;) {
+    if (!fgets(buf, sizeof(buf), in)) {
       fclose(in);
       saymsg(MB_CANCEL,
@@ -75 +74 @@
     if (!strncmp(buf, "begin ", 6))
       break;
-  }
+  } // for
   *dest = 0;
   sscanf(buf, "begin %o %259s", &mode, dest);
   dest[CCHMAXPATH - 1] = 0;
-  {                                     /* place dest in same directory as filename by default... */
+  {
+    /* place dest in same directory as filename by default... */
     char build[CCHMAXPATH], *p;
 
     strcpy(build, filename);
     p = strrchr(build, '\\');
-    if (p)
-    {
+    if (p) {
       p++;
       *p = 0;
@@ -95 +94 @@
   }
 
-  if (!export_filename(HWND_DESKTOP, dest, FALSE))
-  {
+  if (!export_filename(HWND_DESKTOP, dest, FALSE)) {
     fclose(in);
     return ret;
@@ -103 +101 @@
   /* create output file */
   out = _fsopen(dest, "ab+", SH_DENYWR);
-  if (!out)
-  {
+  if (!out) {
     fclose(in);
     saymsg(MB_CANCEL,
@@ -134 +131 @@
   int n;
 
-  for (;;)
-  {
+  for (;;) {
     /* for each input line */
     if (!xfgets(buf, sizeof(buf), in,pszSrcFile,__LINE__))
@@ -143 +139 @@
       break;
     bp = &buf[1];
-    while (n > 0)
-    {
+    while (n > 0) {
       outdec(bp, out, n);
       bp += 4;
@@ -181 +176 @@
   {
   case WM_INITDLG:
-    if (mp2)
-    {
+    if (mp2) {
       WinSetWindowPtr(hwnd, 0, mp2);
       wk = (WORKER *) mp2;
-      if (wk -> li && wk -> li -> list && wk -> li -> list[0])
-      {
+      if (wk -> li && wk -> li -> list && wk -> li -> list[0]) {
         WinSendDlgItemMsg(hwnd, MRG_TARGETNAME, EM_SETTEXTLIMIT,
                           MPFROM2SHORT(CCHMAXPATH, 0), MPVOID);
@@ -201 +194 @@
     WinSendDlgItemMsg(hwnd, MRG_LISTBOX, LM_DELETEALL, MPVOID, MPVOID);
     wk = WinQueryWindowPtr(hwnd, 0);
-    if (wk)
-    {
-
+    if (wk) {
       INT x, numfiles = 0;
       SHORT start;
@@ -215 +206 @@
       WinSendDlgItemMsg(hwnd, MRG_TARGETNAME, EM_SETSEL,
                         MPFROM2SHORT(start, CCHMAXPATH), MPVOID);
-      for (x = 0; wk -> li -> list[x]; x++)
-      {
-        if (IsFile(wk -> li -> list[x]) == 1)
-        {
+      for (x = 0; wk -> li -> list[x]; x++) {
+        if (IsFile(wk -> li -> list[x]) == 1) {
           numfiles++;
           WinSendDlgItemMsg(hwnd, MRG_LISTBOX, LM_INSERTITEM,
@@ -226 +215 @@
       }
       WinCheckButton(hwnd, MRG_BINARY, (wk -> li -> type == IDM_MERGEBINARY));
-      if (!numfiles)
-      {
+      if (!numfiles) {
         saymsg(MB_CANCEL | MB_ICONEXCLAMATION,
                hwnd,
@@ -250 +238 @@
           x = (SHORT) WinSendDlgItemMsg(hwnd, MRG_LISTBOX, LM_QUERYSELECTION,
                                         MPFROMSHORT(LIT_FIRST), MPVOID);
-          if (x >= 0)
-          {
+          if (x >= 0) {
             *szBuffer = 0;
             WinSendDlgItemMsg(hwnd, MRG_LISTBOX, LM_QUERYITEMTEXT,
@@ -283 +270 @@
     case MRG_CHANGETARGET:
       wk = WinQueryWindowPtr(hwnd, 0);
-      if (wk)
-      {
-
+      if (wk) {
         CHAR filename[CCHMAXPATH];
 
         strcpy(filename, wk -> li -> targetpath);
-        if (export_filename(HWND_DESKTOP, filename, FALSE) && *filename)
-        {
+        if (export_filename(HWND_DESKTOP, filename, FALSE) && *filename) {
           strcpy(wk -> li -> targetpath, filename);
           WinSetDlgItemText(hwnd, MRG_TARGETNAME, wk -> li -> targetpath);
@@ -317 +301 @@
         x = (SHORT) WinSendDlgItemMsg(hwnd, MRG_LISTBOX, LM_QUERYSELECTION,
                                       MPFROMSHORT(LIT_FIRST), MPVOID);
-        if (x >= 0)
-        {
+        if (x >= 0) {
           *szBuffer = 0;
           WinSendDlgItemMsg(hwnd, MRG_LISTBOX, LM_QUERYITEMTEXT,
                             MPFROM2SHORT(x, CCHMAXPATH),
                             MPFROMP(szBuffer));
-          if (*szBuffer)
-          {
+          if (*szBuffer) {
             WinSendDlgItemMsg(hwnd, MRG_LISTBOX, LM_DELETEITEM,
                               MPFROMSHORT(x), MPVOID);
@@ -353 +335 @@
     case DID_OK:
       wk = WinQueryWindowPtr(hwnd, 0);
-      if (wk)
-      {
-
+      if (wk) {
         BOOL append, binary;
         CHAR **list = NULL, **test, szBuffer[CCHMAXPATH];
@@ -366 +346 @@
                             CCHMAXPATH,
                             szBuffer);
-        if (!*szBuffer)
-        {
+        if (!*szBuffer) {
           DosBeep(50, 100);
           WinSetFocus(HWND_DESKTOP,
@@ -415 +394 @@
           }
         }
-        if (numfiles && list && numfiles + 1 < numalloc)
-        {
+        if (numfiles && list && numfiles + 1 < numalloc) {
           test = xrealloc(list, sizeof(CHAR *) * (numfiles + 1),pszSrcFile,__LINE__);
           if (test)