emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

dd: make it recognize not only 'k' but 'K' too;

Browse Source 
make it (partially) CONFIG_LFS-aware
This commit is contained in:
Denis Vlasenko
2006-10-07 16:24:46 +00:00
parent 890ac9deb2
commit 5625415085
7 changed files with 46 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
networking/httpd.c
View File

@@ -97,14 +97,6 @@ static const char default_path_httpd_conf[] = "/etc";
static const char httpd_conf[] = "httpd.conf";
static const char home[] = "./";
#if ENABLE_LFS
# define cont_l_fmt "%lld"
# define cont_l_type (long long)
#else
# define cont_l_fmt "%ld"
# define cont_l_type (long)
#endif
#define TIMEOUT 60
// Note: busybox xfuncs are not used because we want the server to keep running
@@ -927,8 +919,8 @@ static int sendHeaders(HttpResponseNum responseNum)
if (config->ContentLength != -1) { /* file */
strftime(timeStr, sizeof(timeStr), RFC1123FMT, gmtime(&config->last_mod));
len += sprintf(buf+len, "Last-Modified: %s\r\n%s " cont_l_fmt "\r\n",
timeStr, Content_length, cont_l_type config->ContentLength);
len += sprintf(buf+len, "Last-Modified: %s\r\n%s "FILEOFF_FMT"\r\n",
timeStr, Content_length, (FILEOFF_TYPE) config->ContentLength);
}
strcat(buf, "\r\n");
len += 2;

16
networking/wget.c
View File

@@ -13,22 +13,6 @@
#include "busybox.h"
#include <getopt.h> /* for struct option */
#ifdef CONFIG_LFS
# define FILEOFF_TYPE off64_t
# define FILEOFF_FMT "%lld"
# define LSEEK lseek64
# define STRTOOFF strtoll
# define SAFE_STRTOOFF safe_strtoll
/* stat64 etc as needed... */
#else
# define FILEOFF_TYPE off_t
# define FILEOFF_FMT "%ld"
# define LSEEK lseek
# define STRTOOFF strtol
# define SAFE_STRTOOFF safe_strtol
/* Do we need to undefine O_LARGEFILE? */
#endif
struct host_info {
// May be used if we ever will want to free() all xstrdup()s...
/* char *allocated; */