Changeset 1c0cef0 in mainline

Timestamp:

2013-09-14T19:39:45Z (11 years ago)

Author:

Martin Sucha <sucha14@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

3f03199, b7adc22

Parents:

9e59c3b8 (diff), d7b7f5e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge initial version of HTTP downloader.

Files:

• .bzrignore (modified) (1 diff)
• boot/Makefile.common (modified) (1 diff)
• tools/config.py (modified) (2 diffs)
• uspace/Makefile (modified) (3 diffs)
• uspace/Makefile.common (modified) (1 diff)
• uspace/app/download/Makefile (added)
• uspace/app/download/main.c (added)
• uspace/app/wavplay/drec.c (modified) (1 diff)
• uspace/lib/c/generic/io/asprintf.c (modified) (2 diffs)
• uspace/lib/c/include/stdio.h (modified) (1 diff)
• uspace/lib/http/Makefile (added)
• uspace/lib/http/http.c (added)
• uspace/lib/http/http.h (added)
• uspace/lib/uri/Makefile (added)
• uspace/lib/uri/ctype.h (added)
• uspace/lib/uri/uri.c (added)
• uspace/lib/uri/uri.h (added)

.bzrignore

@@ -273 +273 @@
 uspace/app/df/df
 uspace/dist/app/df
+uspace/app/download/download
+uspace/dist/app/download

boot/Makefile.common

@@ -174 +174 @@
         $(USPACE_PATH)/app/dnscfg/dnscfg \
         $(USPACE_PATH)/app/dnsres/dnsres \
+        $(USPACE_PATH)/app/download/download \
         $(USPACE_PATH)/app/edit/edit \
         $(USPACE_PATH)/app/inet/inet \

tools/config.py

@@ -363 +363 @@
 def create_output(mkname, mcname, config, rules):
         "Create output configuration"
-        
-        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())
+
+        timestamp_unix = int(time.time())
+        timestamp = time.strftime("%Y-%m-%d %H:%M:%S", time.localtime(timestamp_unix))
         
         sys.stderr.write("Fetching current revision identifier ... ")
@@ -423 +424 @@
                 outmc.write('#define REVISION %s\n' % revision)
                 defs += ' "-DREVISION=%s"' % revision
+        
+        outmk.write('TIMESTAMP_UNIX = %d\n' % timestamp_unix)
+        outmc.write('#define TIMESTAMP_UNIX %d\n' % timestamp_unix)
+        defs += ' "-DTIMESTAMP_UNIX=%d"\n' % timestamp_unix
         
         outmk.write('TIMESTAMP = %s\n' % timestamp)

uspace/Makefile

@@ -42 +42 @@
         app/dnscfg \
         app/dnsres \
+        app/download \
         app/edit \
         app/getterm \
@@ -234 +235 @@
         lib/gui \
         lib/hound \
+        lib/http \
         lib/softrend \
         lib/draw \
@@ -239 +241 @@
         lib/nic \
         lib/ext4 \
+        lib/uri \
         lib/usb \
         lib/usbhost \

uspace/Makefile.common

@@ -141 +141 @@
 LIBBITHENGE_PREFIX = $(LIB_PREFIX)/bithenge
 
+LIBHTTP_PREFIX = $(LIB_PREFIX)/http
+LIBURI_PREFIX = $(LIB_PREFIX)/uri
+
 ifeq ($(STATIC_NEEDED),y)
         STATIC_BUILD = y

uspace/app/wavplay/drec.c

@@ -213 +213 @@
         wave_header_t header;
         fseek(rec.file, sizeof(header), SEEK_SET);
-        const char *error;
-        if (ret != EOK) {
-                printf("Error parsing wav header: %s.\n", error);
+        if (ret != EOK) {
+                printf("Error parsing wav header\n");
                 goto cleanup;
         }

uspace/lib/c/generic/io/asprintf.c

@@ -50 +50 @@
 }
 
+int vprintf_size(const char *fmt, va_list args)
+{
+        printf_spec_t ps = {
+                asprintf_str_write,
+                asprintf_wstr_write,
+                NULL
+        };
+        
+        return printf_core(fmt, &ps, args);
+}
+
+int printf_size(const char *fmt, ...)
+{
+        va_list args;
+        va_start(args, fmt);
+        int ret = vprintf_size(fmt, args);
+        va_end(args);
+        
+        return ret;
+}
+
 /** Allocate and print to string.
  *
@@ -61 +82 @@
 int asprintf(char **strp, const char *fmt, ...)
 {
-        printf_spec_t ps = {
-                asprintf_str_write,
-                asprintf_wstr_write,
-                NULL
-        };
-        
         va_list args;
         va_start(args, fmt);
-        
-        int ret = printf_core(fmt, &ps, args);
+        int ret = vprintf_size(fmt, args);
         va_end(args);
         

uspace/lib/c/include/stdio.h

@@ -124 +124 @@
 extern int vsnprintf(char *, size_t, const char *, va_list);
 
+extern int printf_size(const char *, ...)
+    PRINTF_ATTRIBUTE(1, 2);
+extern int vprintf_size(const char *, va_list);
+
 /* File stream functions */
 extern FILE *fopen(const char *, const char *);