Re: [PATCH 1/2] imap-send.c: implements the GIT_CURL_DEBUG environment variable

[Elia Pinto <gitter.spiros@gmail.com>]

2016-04-01 22:25 GMT+02:00 Eric Sunshine <sunshine@sunshineco.com>:
> On Fri, Apr 1, 2016 at 6:44 AM, Elia Pinto <gitter.spiros@gmail.com> wrote:
>> Implements the GIT_CURL_DEBUG environment variable to allow a greater
>> degree of detail of GIT_CURL_VERBOSE, in particular the complete
>> transport header and all the data payload exchanged.
>> It might be useful if a particular situation could require a more
>> thorough debugging analysis.
>
> In addition to review comments by others, why are the new curl_dump()
> and curl_trace() functions duplicated in both patches rather than
> factored out to a shared implementation?
It's right. Do you think i can use some existing file or should I
create a new object file ?

Thank you very much
>
>> Signed-off-by: Elia Pinto <gitter.spiros@gmail.com>
>> ---
>> diff --git a/imap-send.c b/imap-send.c
>> @@ -1395,6 +1395,96 @@ static int append_msgs_to_imap(struct imap_server_conf *server,
>>  }
>>
>>  #ifdef USE_CURL_FOR_IMAP_SEND
>> +
>> +static
>> +void curl_dump(const char *text,
>> +         FILE * stream, unsigned char *ptr, size_t size, char nohex)
>> +{
>> +       size_t i;
>> +       size_t c;
>> +
>> +       unsigned int width = 0x10;
>> +
>> +       if (nohex)
>> +               /* without the hex output, we can fit more on screen */
>> +               width = 0x40;
>> +
>> +       fprintf(stream, "%s, %10.10ld bytes (0x%8.8lx)\n",
>> +               text, (long)size, (long)size);
>> +
>> +       for (i = 0; i < size; i += width) {
>> +
>> +               fprintf(stream, "%4.4lx: ", (long)i);
>> +
>> +               if (!nohex) {
>> +                       /* hex not disabled, show it */
>> +                       for (c = 0; c < width; c++)
>> +                               if (i + c < size)
>> +                                       fprintf(stream, "%02x ", ptr[i + c]);
>> +                               else
>> +                                       fputs("   ", stream);
>> +               }
>> +
>> +               for (c = 0; (c < width) && (i + c < size); c++) {
>> +                       /* check for 0D0A; if found, skip past and start a new line of output */
>> +                       if (nohex && (i + c + 1 < size) && ptr[i + c] == 0x0D
>> +                           && ptr[i + c + 1] == 0x0A) {
>> +                               i += (c + 2 - width);
>> +                               break;
>> +                       }
>> +                       fprintf(stream, "%c",
>> +                               (ptr[i + c] >= 0x20)
>> +                               && (ptr[i + c] < 0x80) ? ptr[i + c] : '.');
>> +                       /* check again for 0D0A, to avoid an extra \n if it's at width */
>> +                       if (nohex && (i + c + 2 < size)
>> +                           && ptr[i + c + 1] == 0x0D
>> +                           && ptr[i + c + 2] == 0x0A) {
>> +                               i += (c + 3 - width);
>> +                               break;
>> +                       }
>> +               }
>> +               fputc('\n', stream);    /* newline */
>> +       }
>> +       fflush(stream);
>> +}
>> +
>> +static
>> +int curl_trace(CURL * handle, curl_infotype type,
>> +            char *data, size_t size, void *userp)
>> +{
>> +       const char *text;
>> +       (void)handle;           /* prevent compiler warning */
>> +
>> +       switch (type) {
>> +       case CURLINFO_TEXT:
>> +               fprintf(stderr, "== Info: %s", data);
>> +       default:                /* in case a new one is introduced to shock us */
>> +               return 0;
>> +
>> +       case CURLINFO_HEADER_OUT:
>> +               text = "=> Send header";
>> +               break;
>> +       case CURLINFO_DATA_OUT:
>> +               text = "=> Send data";
>> +               break;
>> +       case CURLINFO_SSL_DATA_OUT:
>> +               text = "=> Send SSL data";
>> +               break;
>> +       case CURLINFO_HEADER_IN:
>> +               text = "<= Recv header";
>> +               break;
>> +       case CURLINFO_DATA_IN:
>> +               text = "<= Recv data";
>> +               break;
>> +       case CURLINFO_SSL_DATA_IN:
>> +               text = "<= Recv SSL data";
>> +               break;
>> +       }
>> +
>> +       curl_dump(text, stderr, (unsigned char *)data, size, 1);
>> +       return 0;
>> +}