Commit 7e859640 authored by Steve Holme's avatar Steve Holme
Browse files

examples: Synchronised comments between SMTP MAIL examples

parent 9bd2fdb8

docs/examples/smtp-mail.c

+2 −2
Original line number Diff line number Diff line
@@ -111,7 +111,7 @@ int main(void) 
    curl_easy_setopt(curl, CURLOPT_READDATA, &upload_ctx);

    curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);



    /* send the message (including headers) */

    /* Send the message */

    res = curl_easy_perform(curl);



    /* Check for errors */
@@ -119,7 +119,7 @@ int main(void) 
      fprintf(stderr, "curl_easy_perform() failed: %s\n",

              curl_easy_strerror(res));



    /* free the list of recipients */

    /* Free the list of recipients */

    curl_slist_free_all(recipients);



    /* curl won't send the QUIT command until you call cleanup, so you should be

docs/examples/smtp-ssl.c

+10 −5
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ static const char *payload_text[] = { 
  "From: " FROM "(Example User)\r\n",

  "Cc: " CC "(Another example User)\r\n",

  "Message-ID: <dcd7cb36-11db-487a-9f3a-e652a9458efd@rfcpedant.example.org>\r\n",

  "Subject: SMTP TLS example message\r\n",

  "Subject: SMTP SSL example message\r\n",

  "\r\n", /* empty line to divide headers from body, see RFC5322 */

  "The body of the message starts here.\r\n",

  "\r\n",
@@ -115,7 +115,12 @@ int main(void) 
    curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);

#endif



    /* Value for envelope reverse-path */

    /* Note that this option isn't strictly required, omitting it will result in

     * libcurl sending the MAIL FROM command with empty sender data. All

     * autoresponses should have an empty reverse-path, and should be directed

     * to the address in the reverse-path which triggered them. Otherwise, they

     * could cause an endless loop. See RFC 5321 Section 4.5.5 for more details.

     */

    curl_easy_setopt(curl, CURLOPT_MAIL_FROM, FROM);



    /* Add two recipients, in this particular case they correspond to the
@@ -125,9 +130,9 @@ int main(void) 
    recipients = curl_slist_append(recipients, CC);

    curl_easy_setopt(curl, CURLOPT_MAIL_RCPT, recipients);



    /* In this case, we're using a callback function to specify the data. You

     * could just use the CURLOPT_READDATA option to specify a FILE pointer to

     * read from. */

    /* We're using a callback function to specify the payload (the headers and

     * body of the message). You could just use the CURLOPT_READDATA option to

     * specify a FILE pointer to read from. */

    curl_easy_setopt(curl, CURLOPT_READFUNCTION, payload_source);

    curl_easy_setopt(curl, CURLOPT_READDATA, &upload_ctx);

    curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);

docs/examples/smtp-tls.c

+9 −4
Original line number Diff line number Diff line
@@ -117,7 +117,12 @@ int main(void) 
     * docs/SSLCERTS for more information. */

    curl_easy_setopt(curl, CURLOPT_CAINFO, "/path/to/certificate.pem");



    /* Value for envelope reverse-path */

    /* Note that this option isn't strictly required, omitting it will result in

     * libcurl sending the MAIL FROM command with empty sender data. All

     * autoresponses should have an empty reverse-path, and should be directed

     * to the address in the reverse-path which triggered them. Otherwise, they

     * could cause an endless loop. See RFC 5321 Section 4.5.5 for more details.

     */

    curl_easy_setopt(curl, CURLOPT_MAIL_FROM, FROM);



    /* Add two recipients, in this particular case they correspond to the
@@ -127,9 +132,9 @@ int main(void) 
    recipients = curl_slist_append(recipients, CC);

    curl_easy_setopt(curl, CURLOPT_MAIL_RCPT, recipients);



    /* In this case, we're using a callback function to specify the data. You

     * could just use the CURLOPT_READDATA option to specify a FILE pointer to

     * read from. */

    /* We're using a callback function to specify the payload (the headers and

     * body of the message). You could just use the CURLOPT_READDATA option to

     * specify a FILE pointer to read from. */

    curl_easy_setopt(curl, CURLOPT_READFUNCTION, payload_source);

    curl_easy_setopt(curl, CURLOPT_READDATA, &upload_ctx);

    curl_easy_setopt(curl, CURLOPT_UPLOAD, 1L);