VladPolskiy/apache-http-server
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2025-08-15 23:27:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix look in htdigest. Reimplemented getline to work properly with

Browse Source 
APR. Shuld consider adding apr_file_getline() to APR.  Should also consider
changing apr_file_getc() to return characters rather than apr_status.


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89331 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Bill Stoddard
2001-06-10 21:01:57 +00:00
parent d8462ec039
commit 9f0a1da97a
2 changed files with 15 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
support/htdigest.c
View File

@ -122,24 +122,20 @@ static int getline(char *s, int n, apr_file_t *f)
{
register int i = 0;
char ch;
apr_status_t rv;
while (1) {
apr_file_getc(&ch, f);
s[i] = ch;
if (s[i] == CR)
apr_file_getc(&ch, f);
s[i] = ch;
if ((s[i] == 0x4) || (s[i] == LF) || (i == (n - 1))) {
s[i] = '\0';
if (apr_file_eof(f) == APR_EOF) {
return 1;
}
return 0;
}
++i;
while (i < (n - 1) &&
((rv = apr_file_getc(&ch, f)) == APR_SUCCESS) && (ch != '\n')) {
s[i++] = ch;
}
if (ch == '\n')
s[i++] = ch;
s[i] = '\0';
if (rv != APR_SUCCESS)
return 1;
return 0;
}
static void putline(apr_file_t *f, char *l)
@ -148,7 +144,6 @@ static void putline(apr_file_t *f, char *l)
for (x = 0; l[x]; x++)
apr_file_putc(l[x], f);
apr_file_putc('\n', f);
}