darcs patch: make curl_global_init test work with msy... (and 2 more)

Fri Nov 26 11:02:15 MST 2004  Will <will@xxxxxxxxxx>
  * make curl_global_init test work with msys+mingw

Fri Nov 26 15:12:36 MST 2004  Will <will@xxxxxxxxxx>
  * use MAPI to resolve to and from addresses

Fri Nov 26 16:19:12 MST 2004  Will <will@xxxxxxxxxx>
  * append CR to conflict markers when existing contents end with CR

New patches:

[make curl_global_init test work with msys+mingw
Will <will@xxxxxxxxxx>**20041126180215] {
hunk ./configure.ac 341
-    HAVE_LIBCURL=True
-    CFLAGS="$CFLAGS $CURLCFLAGS"
-    LDFLAGS="$LDFLAGS $CURLLDFLAGS"
-    AC_CHECK_LIB(curl, curl_global_init,,
-                 AC_MSG_ERROR(Cannot actually use libcurl, try specifying 
--without-libcurl.))
+    AC_CHECK_LIB(curl, curl_global_init,
+                 [HAVE_LIBCURL=True
+                  CFLAGS="$CFLAGS $CURLCFLAGS"
+                  LDFLAGS="$LDFLAGS $CURLLDFLAGS"],
+                 AC_MSG_ERROR(Cannot actually use libcurl; try specifying 
--without-libcurl.),
+                 $CURLCFLAGS $CURLLDFLAGS)
}

[use MAPI to resolve to and from addresses
Will <will@xxxxxxxxxx>**20041126221236] {
hunk ./win32/send_email.c 9
+ULONG get_recipient(const char *name, ULONG recipClass, lpMapiRecipDesc *desc);
+
hunk ./win32/send_email.c 21
-    MapiRecipDesc orig;
-    MapiRecipDesc recips[20];
-    MapiRecipDesc *recip = &recips[0], *cc = &recips[1];
-    int num_recip = 1;
+    MapiRecipDesc *orig, *recip, *cc;
+    int num_recip = 1, return_code = -1;
hunk ./win32/send_email.c 26
- 
+
+    orig = recip = cc = NULL;
hunk ./win32/send_email.c 29
-    memset(&orig, 0, sizeof(orig));
-    orig.ulRecipClass = MAPI_ORIG;
-    orig.lpszName = (LPSTR)sendname;
-    orig.lpszAddress = 0;
-    orig.ulEIDSize = strlen(sendname);
-    orig.lpEntryID = (LPSTR)sendname;
+    if (get_recipient(sendname, MAPI_ORIG, &orig) != SUCCESS_SUCCESS) {
+        goto cleanup;
+    }
hunk ./win32/send_email.c 33
-    memset(recip, 0, sizeof(recip));
-    recip->ulRecipClass = MAPI_TO;
-    recip->lpszName = (LPSTR)recvname;
-    recip->lpszAddress = 0;
-    recip->ulEIDSize = strlen(recvname);
-    recip->lpEntryID = (LPSTR)recvname;
-
+    if (get_recipient(recvname, MAPI_TO, &recip) != SUCCESS_SUCCESS) {
+        goto cleanup;
+    }
+    
hunk ./win32/send_email.c 38
-        memset(cc, 0, sizeof(cc));
-        cc->ulRecipClass = MAPI_CC;
-        cc->lpszName = (LPSTR)ccname;
-        cc->lpszAddress = 0;
-        cc->ulEIDSize = strlen(ccname);
-        cc->lpEntryID = (LPSTR)ccname;
+        if (get_recipient(ccname, MAPI_CC, &cc) != SUCCESS_SUCCESS) {
+            goto cleanup;
+        }
hunk ./win32/send_email.c 44
-
hunk ./win32/send_email.c 45
-    msg.lpOriginator = &orig;
+    msg.lpOriginator = orig;
hunk ./win32/send_email.c 48
-    msg.lpszNoteText = body;
+    msg.lpszNoteText = (LPSTR) body;
hunk ./win32/send_email.c 76
-
hunk ./win32/send_email.c 81
-        return -1;
+        goto cleanup;
hunk ./win32/send_email.c 84
-    return 0;
+    return_code = 0;
+    
+  cleanup:
+    if (orig) MAPIFreeBuffer(orig);
+    if (recip) MAPIFreeBuffer(recip);
+    if (cc) MAPIFreeBuffer(cc);
+
+    return return_code;
hunk ./win32/send_email.c 94
-
+ULONG get_recipient(const char *name, ULONG recipClass, lpMapiRecipDesc *desc) 
{
+    ULONG ret = MAPIResolveName(0, 0, (LPSTR) name, 0, 0, desc);
+    if (ret != SUCCESS_SUCCESS) {
+        fprintf(stderr, "MAPIResolveName could not resolve '%s'\n", name);
+    } else {
+        (*desc)->ulRecipClass = recipClass;
+    }
+    return ret;
+}
}

[append CR to conflict markers when existing contents end with CR
Will <will@xxxxxxxxxx>**20041126231912] {
hunk ./Patch.lhs 117
-                          unlinesPS,
+                          unlinesPS, lastPS
hunk ./Patch.lhs 1674
-          top    = packString "v v v v v v v"
-          middle = packString "*************"
-          bottom = packString "^ ^ ^ ^ ^ ^ ^"
+          top    = packString $ "v v v v v v v" ++ eol_c
+          middle = packString $ "*************" ++ eol_c
+          bottom = packString $ "^ ^ ^ ^ ^ ^ ^" ++ eol_c
+          eol_c  = if any (\ps -> not (nullPS ps) && lastPS ps == '\r') old
+                   then "\r"
+                   else ""
}



Context:

[fix bug in annotate.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041125120625] 
[check whether libcurl actually works (since curl-config may be broken).
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041125120514] 
[display patch counts or names during get
Will <will@xxxxxxxxxx>**20041124073551] 
[use libcurl if available for copyRemotes.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041123120456] 
[abstract user prompts and strip CR on win32
Will <will@xxxxxxxxxx>**20041123065536] 
[fix problem where the --cc was ignored in apply if the patch succeeded.
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041121140133] 
[TAG 1.0.1pre1
David Roundy <droundy@xxxxxxxxxxxxxxx>**20041121134516] 

Patch bundle hash:
238ed45b0c29019ade2d07da4ddf059cc06e7b43

_______________________________________________
darcs-devel mailing list
darcs-devel@xxxxxxxxx
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel