← Back to branch summary

~ubuntu-branches/ubuntu/quantal/curl/quantal

« back to all changes in this revision

Viewing changes to src/tool_formparse.c

  • Committer: Package Import Robot
  • Author(s): Colin Watson
  • Date: 2012-05-28 12:21:13 UTC
  • mfrom: (3.4.29 sid)
  • Revision ID: package-import@ubuntu.com-20120528122113-i5f42lajprljoudn
Tags: 7.26.0-1ubuntu1
* Resynchronise with Debian.  Remaining changes:
  - Drop dependencies not in main:
    + Build-Depends: Drop stunnel4 and libssh2-1-dev.
    + Drop libssh2-1-dev from binary package Depends.
  - Add new libcurl3-udeb package.
  - Add new curl-udeb package.
* Adjust udeb configure flags handling to something easier to merge in
  future.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/tool_formparse.c
19
19
 * KIND, either express or implied.
20
20
 *
21
21
 ***************************************************************************/
22
 
#include "setup.h"
23
 
 
24
 
#include <curl/curl.h>
 
22
#include "tool_setup.h"
25
23
 
26
24
#include "rawstr.h"
27
25
 
83
81
     build a linked list with the info */
84
82
  char name[256];
85
83
  char *contents = NULL;
86
 
  char major[128];
87
 
  char minor[128];
 
84
  char type_major[128];
 
85
  char type_minor[128];
88
86
  char *contp;
89
87
  const char *type = NULL;
90
88
  char *sep;
148
146
 
149
147
              /* verify that this is a fine type specifier */
150
148
              if(2 != sscanf(type, "%127[^/]/%127[^;,\n]",
151
 
                             major, minor)) {
 
149
                             type_major, type_minor)) {
152
150
                warnf(config, "Illegally formatted content-type field!\n");
153
151
                Curl_safefree(contents);
154
152
                FreeMultiInfo(&multi_start, &multi_current);
156
154
              }
157
155
 
158
156
              /* now point beyond the content-type specifier */
159
 
              sep = (char *)type + strlen(major)+strlen(minor)+1;
 
157
              sep = (char *)type + strlen(type_major)+strlen(type_minor)+1;
160
158
 
161
159
              /* there's a semicolon following - we check if it is a filename
162
160
                 specified and if not we simply assume that it is text that