Fossil SCM

On Win32 isatty/fileno have been deprecated in favor of _isatty/_fileno.

andybradford 2013-11-10 06:01 UTC url-password-fixes
Commit 594bbaea700ed2dd77495d0c211deadf509f2d09
1 file changed +7 -1
+7 -1
--- src/url.c
+++ src/url.c
@@ -17,10 +17,16 @@
1717
**
1818
** This file contains code for parsing URLs that appear on the command-line
1919
*/
2020
#include "config.h"
2121
#include "url.h"
22
+#include <stdio.h>
23
+#ifdef _WIN32
24
+#include <io.h>
25
+#define isatty(d) _isatty(d)
26
+#define fileno(s) _fileno(s)
27
+#endif
2228
2329
#if INTERFACE
2430
/*
2531
** Flags for url_parse()
2632
*/
@@ -472,10 +478,10 @@
472478
** URL but no password.
473479
*/
474480
void url_get_password_if_needed(void){
475481
if( (g.urlUser && g.urlUser[0])
476482
&& (g.urlPasswd==0 || g.urlPasswd[0]==0)
477
- && isatty(fileno(stdin))
483
+ && isatty(fileno(stdin))
478484
){
479485
url_prompt_for_password();
480486
}
481487
}
482488
--- src/url.c
+++ src/url.c
@@ -17,10 +17,16 @@
17 **
18 ** This file contains code for parsing URLs that appear on the command-line
19 */
20 #include "config.h"
21 #include "url.h"
 
 
 
 
 
 
22
23 #if INTERFACE
24 /*
25 ** Flags for url_parse()
26 */
@@ -472,10 +478,10 @@
472 ** URL but no password.
473 */
474 void url_get_password_if_needed(void){
475 if( (g.urlUser && g.urlUser[0])
476 && (g.urlPasswd==0 || g.urlPasswd[0]==0)
477 && isatty(fileno(stdin))
478 ){
479 url_prompt_for_password();
480 }
481 }
482
--- src/url.c
+++ src/url.c
@@ -17,10 +17,16 @@
17 **
18 ** This file contains code for parsing URLs that appear on the command-line
19 */
20 #include "config.h"
21 #include "url.h"
22 #include <stdio.h>
23 #ifdef _WIN32
24 #include <io.h>
25 #define isatty(d) _isatty(d)
26 #define fileno(s) _fileno(s)
27 #endif
28
29 #if INTERFACE
30 /*
31 ** Flags for url_parse()
32 */
@@ -472,10 +478,10 @@
478 ** URL but no password.
479 */
480 void url_get_password_if_needed(void){
481 if( (g.urlUser && g.urlUser[0])
482 && (g.urlPasswd==0 || g.urlPasswd[0]==0)
483 && isatty(fileno(stdin))
484 ){
485 url_prompt_for_password();
486 }
487 }
488

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button