Diff for /libaitwww/inc/aitwww.h between versions 1.3.4.1 and 1.5

version 1.3.4.1, 2012/07/31 11:56:16 version 1.5, 2012/09/20 14:19:45
Line 50  SUCH DAMAGE. Line 50  SUCH DAMAGE.
 #include <sys/types.h>  #include <sys/types.h>
 #include <sys/queue.h>  #include <sys/queue.h>
 #include <sys/uio.h>  #include <sys/uio.h>
   #include <aitio.h>
   
   
 /* URL staff ... */  /* URL staff ... */
Line 60  typedef struct _tagURLItem { Line 61  typedef struct _tagURLItem {
 } url_Item_t;  } url_Item_t;
   
 struct tagIOURL {  struct tagIOURL {
        unsigned char        url_line[BUFSIZ];        ait_val_t        url_line;
   
        url_Item_t      url_tech;        ait_val_t      url_tech;
        url_Item_t      url_user;        ait_val_t      url_user;
        url_Item_t      url_pass;        ait_val_t      url_pass;
        url_Item_t      url_host;        ait_val_t      url_host;
        url_Item_t      url_port;        ait_val_t      url_port;
        url_Item_t      url_path;        ait_val_t      url_path;
        url_Item_t      url_args;        ait_val_t      url_args;
   
        char            *url_reserved;        unsigned char   *url_reserved;
 };  };
   
 struct tagReqXML {  struct tagReqXML {
Line 89  struct tagReqXML { Line 90  struct tagReqXML {
 /* CGI variables */  /* CGI variables */
   
 struct tagCGI {  struct tagCGI {
        char                    *cgi_name;        ait_val_t                *cgi_name;
        char                    *cgi_value;        ait_val_t                *cgi_value;
   
         SLIST_ENTRY(tagCGI)     cgi_node;          SLIST_ENTRY(tagCGI)     cgi_node;
 };  };
Line 133  cgi_t *www_initCGI(void); Line 134  cgi_t *www_initCGI(void);
  * return: none   * return: none
  */   */
 void www_closeCGI(cgi_t ** __restrict cgi);  void www_closeCGI(cgi_t ** __restrict cgi);
   #define www_freeAttributes      www_closeCGI
 /*  /*
  * www_parseQuery() - Parse CGI query string   * www_parseQuery() - Parse CGI query string
  *   *
Line 200  inline int www_header(FILE *output); Line 202  inline int www_header(FILE *output);
  */   */
 inline cgi_t *www_parseAttributes(const char **ct);  inline cgi_t *www_parseAttributes(const char **ct);
 /*  /*
 * www_freeAttributes() - Free attributes * www_getAttribute() - Get Attribute from attribute session
  *   *
 * @attr = Attributes * @cgi = Inited attribute session
 * return: none * @name = Name of attribute variable
  * return: NULL not found or !=NULL value
  */   */
inline void www_freeAttributes(cgi_t ** __restrict attr);inline ait_val_t *www_getAttribute(cgi_t * __restrict cgi, const char *name);
/* 
 * www_getAttribute() - Get attribute by name 
 * 
 * @attr = Attributes 
 * @name = Name of attribute 
 * return: NULL not found or !=NULL attribute value 
 */ 
inline const char *www_getAttribute(cgi_t * __restrict attr, const char *name); 
   
   
 /*  /*
Line 237  int www_cmptype(const char *ct, const char *type); Line 232  int www_cmptype(const char *ct, const char *type);
  *   *
  * @str = query string   * @str = query string
  * @delim = delimiter   * @delim = delimiter
 * return: NULL error or AV pair, must be free() after use! * return: NULL error or AV pair, must be io_free() after use!
  */   */
char *www_getpair(char ** __restrict str, const char *delim);ait_val_t *www_getpair(char ** __restrict str, const char *delim);
 /*  /*
  * www_x2c() - Hex from string to digit   * www_x2c() - Hex from string to digit
  *   *
Line 254  inline char www_x2c(const char *str); Line 249  inline char www_x2c(const char *str);
  * return: none   * return: none
  */   */
 inline void www_unescape(char * __restrict str);  inline void www_unescape(char * __restrict str);
   /*
    * www_undot() - Undotted and clean WWW query filename
    *
    * @pname = query filename
    * return: =NULL error or !=NULL allocated valid filename, after use you must call io_freeVar()
    */
   ait_val_t *www_undot(const char * __restrict pname);
   
   
 /*  /*
    * www_URLInit() - Init URL structure and free old one
    *
    * @url = Input URL
    * return: -1 error or 0 ok
    */
   inline int www_URLInit(struct tagIOURL * __restrict url);
   /*
    * www_URLFree() - URL free structure
    *
    * @url = Input parsed URL
    * return: none
    */
   inline void www_URLFree(struct tagIOURL * __restrict url);
   /*
  * www_URLGet() - Parse and get data from input URL   * www_URLGet() - Parse and get data from input URL
  *   *
  * @csURL = Input URL line   * @csURL = Input URL line
Line 264  inline void www_unescape(char * __restrict str); Line 280  inline void www_unescape(char * __restrict str);
  * return: 0 error format not find tech:// and return URL like path;    * return: 0 error format not find tech:// and return URL like path; 
  *              -1 error:: can`t read; >0 ok, up bits for known elements   *              -1 error:: can`t read; >0 ok, up bits for known elements
  */   */
int www_URLGet(const char *csURL, struct tagIOURL *url);int www_URLGet(const char *csURL, struct tagIOURL * __restrict url);
 /*  /*
  * www_URLGetFile() - Get file from parsed URL   * www_URLGetFile() - Get file from parsed URL
  *   *
  * @url = Input parsed URL   * @url = Input parsed URL
 * @psValue = Return filename, if not specified file in url path, replace with / * @value = Return filename, if not specified file in url path, replace with /
 * @valLen = Size of psValue array * return: -1 error, 0 filename from path, 1 filename or 2 not specified filename
 * return: -1 error:: can`t read; 0 ok 
  */   */
int www_URLGetFile(struct tagIOURL *url, char * __restrict psValue, int valLen);int www_URLGetFile(struct tagIOURL * __restrict url, ait_val_t * __restrict value);
   
 /*  /*
  * www_XMLGet() - Parse and get data from input XML request string    * www_XMLGet() - Parse and get data from input XML request string 
Line 284  int www_URLGetFile(struct tagIOURL *url, char * __rest Line 299  int www_URLGetFile(struct tagIOURL *url, char * __rest
  * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits   * return: 0 error format incorrect, -1 error:: can`t read; >0 ok readed elements bits
  */   */
 int www_XMLGet(const char *csXML, struct tagReqXML *xml);  int www_XMLGet(const char *csXML, struct tagReqXML *xml);
   
   /*
    * www_b64encode() - Base64 encode function
    *
    * @src = source data
    * return: NULL error or !=NULL encoded variable, after use call io_freeVar()
    */
   ait_val_t *www_b64encode(ait_val_t * __restrict src);
   /*
    * www_b64decode() - Base64 decode function
    *
    * @src = source encoded data
    * return: NULL error or !=NULL decoded variable, after use call io_freeVar()
    */
   ait_val_t *www_b64decode(ait_val_t * __restrict src);
   
   
 #endif  #endif

Removed from v.1.3.4.1  
changed lines
  Added in v.1.5


FreeBSD-CVSweb <freebsd-cvsweb@FreeBSD.org>