void blkfree(char **av0)
{
- register char **av = av0;
+ register char **av = av0;
- while (*av)
- free(*av++);
+ while (*av)
+ free(*av++);
}
-char **glob(register char *v)
+char **glob(const char *v)
{
return NULL;
}
#if 0
int gettimeofday(struct timeval *timenow,
- struct timezone *zone)
+ struct timezone *zone)
{
- time_t t;
+ time_t t;
- t = clock();
+ t = clock();
- timenow->tv_usec = t;
- timenow->tv_sec = t / CLK_TCK;
+ timenow->tv_usec = t;
+ timenow->tv_sec = t / CLK_TCK;
- return 0;
+ return 0;
}
int fgetcSocket(int s)
total = recv(s, buffer, sizeof(buffer), 0);
if (total == SOCKET_ERROR)
- {
- total = 0;
- return ERROR;
- }
+ {
+ total = 0;
+ return ERROR;
+ }
if (total == 0)
- return EOF;
+ return EOF;
}
return buffer[index++];
}
buffer[1] = '\0';
if(SOCKET_ERROR==send(s, buffer, 1, 0)) {
- int iret=WSAGetLastError ();
- fprintf(stdout,"fputcSocket: %d\n",iret);
- return 0;
+ int iret=WSAGetLastError ();
+ fprintf(stdout,"fputcSocket: %d\n",iret);
+ return 0;
}
else {
- return putChar;
+ return putChar;
}
}
int fputSocket(int s, char *buffer, int len)
{
- int iret;
- while(len) {
- if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
- {
- iret=WSAGetLastError ();
- fprintf(stdout,"fputcSocket: %d\n",iret);
- return 0;
- }
- else {
- return len-=iret;
- }
- }
- return 0;
+ int iret;
+ while(len) {
+ if(SOCKET_ERROR==(iret=send(s, buffer, len, 0)))
+ {
+ iret=WSAGetLastError ();
+ fprintf(stdout,"fputcSocket: %d\n",iret);
+ return 0;
+ }
+ else {
+ return len-=iret;
+ }
+ }
+ return 0;
}
char *fgetsSocket(int s, char *string)
if (count == SOCKET_ERROR)
{
- printf("Error in fgetssocket");
- return NULL;
+ printf("Error in fgetssocket");
+ return NULL;
}
if (count == 1)
{
- string[i] = buffer[0];
-
- if (i == MAX_ASCII - 3)
- {
- count = 0;
- string[++i] = '\n';
- string[++i] = '\0';
- }
+ string[i] = buffer[0];
+
+ if (i == MAX_ASCII - 3)
+ {
+ count = 0;
+ string[++i] = '\n';
+ string[++i] = '\0';
+ }
}
else
{
- if (i == 0)
- return NULL;
- else
- {
- string[i] = '\n';
- string[i + 1] = '\0'; // This is risky
- return string;
- }
+ if (i == 0)
+ return NULL;
+ else
+ {
+ string[i] = '\n';
+ string[i + 1] = '\0'; // This is risky
+ return string;
+ }
}
int rc;
if (istty)
- {
- if (GetConsoleMode (in, &old_flags))
- SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
- else
- istty = 0;
- }
+ {
+ if (GetConsoleMode (in, &old_flags))
+ SetConsoleMode (in, ENABLE_LINE_INPUT | ENABLE_PROCESSED_INPUT);
+ else
+ istty = 0;
+ }
/* Need to read line one byte at time to avoid blocking, if not a
tty, so always do it this way. */
count = 0;
while (1)
- {
- DWORD dummy;
- char one_char;
-
- rc = ReadFile (in, &one_char, 1, &dummy, NULL);
- if (rc == 0)
- break;
- if (one_char == '\r')
- {
- /* CR is always followed by LF if reading from tty. */
- if (istty)
- continue;
- else
- break;
- }
- if (one_char == '\n')
- break;
- /* Silently truncate password string if overly long. */
- if (count < sizeof (input) - 1)
- input[count++] = one_char;
- }
+ {
+ DWORD dummy;
+ char one_char;
+
+ rc = ReadFile (in, &one_char, 1, &dummy, NULL);
+ if (rc == 0)
+ break;
+ if (one_char == '\r')
+ {
+ /* CR is always followed by LF if reading from tty. */
+ if (istty)
+ continue;
+ else
+ break;
+ }
+ if (one_char == '\n')
+ break;
+ /* Silently truncate password string if overly long. */
+ if (count < sizeof (input) - 1)
+ input[count++] = one_char;
+ }
input[count] = '\0';
WriteFile (err, "\r\n", 2, &count, NULL);
if (istty)
- SetConsoleMode (in, old_flags);
+ SetConsoleMode (in, old_flags);
if (rc)
- return input;
+ return input;
}
return NULL;