Fossil SCM
Coding style tweaks.
Commit
34d988c2444c71aeada3675e5110d4bc2007dca4
Parent
04a8ee6ec25315c…
1 file changed
+10
-7
+10
-7
| --- src/user.c | ||
| +++ src/user.c | ||
| @@ -47,27 +47,30 @@ | ||
| 47 | 47 | |
| 48 | 48 | /* |
| 49 | 49 | ** getpass() for Windows and Android. |
| 50 | 50 | */ |
| 51 | 51 | static char *zPwdBuffer = 0; |
| 52 | -static size_t pwdBufferSize = 0; | |
| 52 | +static size_t nPwdBuffer = 0; | |
| 53 | 53 | |
| 54 | 54 | static char *getpass(const char *prompt){ |
| 55 | 55 | char *zPwd; |
| 56 | + size_t nPwd; | |
| 56 | 57 | size_t i; |
| 57 | 58 | |
| 58 | 59 | if( zPwdBuffer==0 ){ |
| 59 | - zPwdBuffer = fossil_secure_alloc_page(&pwdBufferSize); | |
| 60 | + zPwdBuffer = fossil_secure_alloc_page(&nPwdBuffer); | |
| 60 | 61 | assert( zPwdBuffer ); |
| 61 | 62 | }else{ |
| 62 | - fossil_secure_zero(zPwdBuffer, pwdBufferSize); | |
| 63 | + fossil_secure_zero(zPwdBuffer, nPwdBuffer); | |
| 63 | 64 | } |
| 64 | 65 | zPwd = zPwdBuffer; |
| 66 | + nPwd = nPwdBuffer; | |
| 65 | 67 | fputs(prompt,stderr); |
| 66 | 68 | fflush(stderr); |
| 67 | - assert( pwdBufferSize>0 ); | |
| 68 | - for(i=0; i<pwdBufferSize-1; ++i){ | |
| 69 | + assert( zPwd!=0 ); | |
| 70 | + assert( nPwd>0 ); | |
| 71 | + for(i=0; i<nPwd-1; ++i){ | |
| 69 | 72 | #if defined(_WIN32) |
| 70 | 73 | zPwd[i] = _getch(); |
| 71 | 74 | #else |
| 72 | 75 | zPwd[i] = getc(stdin); |
| 73 | 76 | #endif |
| @@ -98,12 +101,12 @@ | ||
| 98 | 101 | assert( zPwd==zPwdBuffer ); |
| 99 | 102 | return zPwd; |
| 100 | 103 | } |
| 101 | 104 | void freepass(){ |
| 102 | 105 | if( !zPwdBuffer ) return; |
| 103 | - assert( pwdBufferSize>0 ); | |
| 104 | - fossil_secure_free_page(zPwdBuffer, pwdBufferSize); | |
| 106 | + assert( nPwdBuffer>0 ); | |
| 107 | + fossil_secure_free_page(zPwdBuffer, nPwdBuffer); | |
| 105 | 108 | } |
| 106 | 109 | #endif |
| 107 | 110 | |
| 108 | 111 | #if defined(_WIN32) || defined(WIN32) |
| 109 | 112 | # include <io.h> |
| 110 | 113 |
| --- src/user.c | |
| +++ src/user.c | |
| @@ -47,27 +47,30 @@ | |
| 47 | |
| 48 | /* |
| 49 | ** getpass() for Windows and Android. |
| 50 | */ |
| 51 | static char *zPwdBuffer = 0; |
| 52 | static size_t pwdBufferSize = 0; |
| 53 | |
| 54 | static char *getpass(const char *prompt){ |
| 55 | char *zPwd; |
| 56 | size_t i; |
| 57 | |
| 58 | if( zPwdBuffer==0 ){ |
| 59 | zPwdBuffer = fossil_secure_alloc_page(&pwdBufferSize); |
| 60 | assert( zPwdBuffer ); |
| 61 | }else{ |
| 62 | fossil_secure_zero(zPwdBuffer, pwdBufferSize); |
| 63 | } |
| 64 | zPwd = zPwdBuffer; |
| 65 | fputs(prompt,stderr); |
| 66 | fflush(stderr); |
| 67 | assert( pwdBufferSize>0 ); |
| 68 | for(i=0; i<pwdBufferSize-1; ++i){ |
| 69 | #if defined(_WIN32) |
| 70 | zPwd[i] = _getch(); |
| 71 | #else |
| 72 | zPwd[i] = getc(stdin); |
| 73 | #endif |
| @@ -98,12 +101,12 @@ | |
| 98 | assert( zPwd==zPwdBuffer ); |
| 99 | return zPwd; |
| 100 | } |
| 101 | void freepass(){ |
| 102 | if( !zPwdBuffer ) return; |
| 103 | assert( pwdBufferSize>0 ); |
| 104 | fossil_secure_free_page(zPwdBuffer, pwdBufferSize); |
| 105 | } |
| 106 | #endif |
| 107 | |
| 108 | #if defined(_WIN32) || defined(WIN32) |
| 109 | # include <io.h> |
| 110 |
| --- src/user.c | |
| +++ src/user.c | |
| @@ -47,27 +47,30 @@ | |
| 47 | |
| 48 | /* |
| 49 | ** getpass() for Windows and Android. |
| 50 | */ |
| 51 | static char *zPwdBuffer = 0; |
| 52 | static size_t nPwdBuffer = 0; |
| 53 | |
| 54 | static char *getpass(const char *prompt){ |
| 55 | char *zPwd; |
| 56 | size_t nPwd; |
| 57 | size_t i; |
| 58 | |
| 59 | if( zPwdBuffer==0 ){ |
| 60 | zPwdBuffer = fossil_secure_alloc_page(&nPwdBuffer); |
| 61 | assert( zPwdBuffer ); |
| 62 | }else{ |
| 63 | fossil_secure_zero(zPwdBuffer, nPwdBuffer); |
| 64 | } |
| 65 | zPwd = zPwdBuffer; |
| 66 | nPwd = nPwdBuffer; |
| 67 | fputs(prompt,stderr); |
| 68 | fflush(stderr); |
| 69 | assert( zPwd!=0 ); |
| 70 | assert( nPwd>0 ); |
| 71 | for(i=0; i<nPwd-1; ++i){ |
| 72 | #if defined(_WIN32) |
| 73 | zPwd[i] = _getch(); |
| 74 | #else |
| 75 | zPwd[i] = getc(stdin); |
| 76 | #endif |
| @@ -98,12 +101,12 @@ | |
| 101 | assert( zPwd==zPwdBuffer ); |
| 102 | return zPwd; |
| 103 | } |
| 104 | void freepass(){ |
| 105 | if( !zPwdBuffer ) return; |
| 106 | assert( nPwdBuffer>0 ); |
| 107 | fossil_secure_free_page(zPwdBuffer, nPwdBuffer); |
| 108 | } |
| 109 | #endif |
| 110 | |
| 111 | #if defined(_WIN32) || defined(WIN32) |
| 112 | # include <io.h> |
| 113 |