bspatch: Report errors on MBS_ApplyPatch.

third_party/bspatch/mbspatch.cc

 /*-
  * Copyright 2003,2004 Colin Percival
  * All rights reserved
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted providing that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 68 matching lines @@
     return UNEXPECTED_ERROR;
 
   if (sizeof(MBSPatchHeader) +
       header->cblen +
       header->difflen +
       header->extralen != int(hs.st_size))
     return UNEXPECTED_ERROR;
 
   return OK;
 }
-         
+
 int
 MBS_ApplyPatch(const MBSPatchHeader *header, int patchfd,
                unsigned char *fbuffer, int filefd)
 {
   unsigned char *fbufend = fbuffer + header->slen;
 
   unsigned char *buf = (unsigned char*) malloc(header->cblen +
                                                header->difflen +
                                                header->extralen);
   if (!buf)
@@ skipping 156 matching lines @@
       ret = CRC_ERROR;
       break;
     }
 
     nfd = _wopen(new_file, O_WRONLY | O_TRUNC | O_CREAT | _O_BINARY);
     if (nfd < 0) {
       ret = READ_ERROR;
       break;
     }
 
-    MBS_ApplyPatch(&header, pfd, buf, nfd);
+    ret = MBS_ApplyPatch(&header, pfd, buf, nfd);

[grt (UTC plus 2), 2014/05/13 15:10:06]

nice catch. shouldn't this be:
    if ((ret = MBS_ApplyPatch(&header, pfd, buf, nfd)))
      break;

[deymo, 2014/05/13 18:14:40]

Yeah, both options work (because this is the last instruction on the 'do {}
while(0)' ). I can change that anyway.

[grt (UTC plus 2), 2014/05/13 18:37:04]

oh, ha. i didn't notice that it was while(0). in that case, lgtm.

   } while (0);
 
   free(buf);
   close(pfd);
   if (ofd >= 0) close(ofd);
   if (nfd >= 0) close(nfd);
   return ret;
 }