Fossil SCM
Simplify the mkversion changes from the previous commit.
Commit
ae85ba156cae59e2aa6037c74df555c66417002f
Parent
6b8ef6a4fd5610f…
1 file changed
+4
-5
+4
-5
| --- src/mkversion.c | ||
| +++ src/mkversion.c | ||
| @@ -13,14 +13,12 @@ | ||
| 13 | 13 | int main(int argc, char *argv[]){ |
| 14 | 14 | FILE *m,*u,*v; |
| 15 | 15 | char *z; |
| 16 | 16 | int i, x, d; |
| 17 | 17 | char b[1000]; |
| 18 | - char b2[1000]; | |
| 19 | 18 | char vx[1000]; |
| 20 | 19 | memset(b,0,sizeof(b)); |
| 21 | - memset(b2,0,sizeof(b2)); | |
| 22 | 20 | memset(vx,0,sizeof(vx)); |
| 23 | 21 | u = fopen(argv[1],"r"); |
| 24 | 22 | fgets(b, sizeof(b)-1,u); |
| 25 | 23 | fclose(u); |
| 26 | 24 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| @@ -55,22 +53,23 @@ | ||
| 55 | 53 | } |
| 56 | 54 | z++; |
| 57 | 55 | } |
| 58 | 56 | for(z=vx; z[0]=='0'; z++){} |
| 59 | 57 | printf("#define RELEASE_VERSION_NUMBER %s\n", z); |
| 60 | - strcpy(b2,b); | |
| 58 | + memset(vx,0,sizeof(vx)); | |
| 59 | + strcpy(vx,b); | |
| 61 | 60 | d = 0; |
| 62 | - for(z=b2; z[0]; z++){ | |
| 61 | + for(z=vx; z[0]; z++){ | |
| 63 | 62 | if( z[0]!='.' ) continue; |
| 64 | 63 | if ( d<3 ){ |
| 65 | 64 | z[0] = ','; |
| 66 | 65 | d++; |
| 67 | 66 | }else{ |
| 68 | 67 | z[0] = '\0'; |
| 69 | 68 | break; |
| 70 | 69 | } |
| 71 | 70 | } |
| 72 | - printf("#define RELEASE_RESOURCE_VERSION %s", b2); | |
| 71 | + printf("#define RELEASE_RESOURCE_VERSION %s", vx); | |
| 73 | 72 | while( d<3 ){ printf(",0"); d++; } |
| 74 | 73 | printf("\n"); |
| 75 | 74 | return 0; |
| 76 | 75 | } |
| 77 | 76 |
| --- src/mkversion.c | |
| +++ src/mkversion.c | |
| @@ -13,14 +13,12 @@ | |
| 13 | int main(int argc, char *argv[]){ |
| 14 | FILE *m,*u,*v; |
| 15 | char *z; |
| 16 | int i, x, d; |
| 17 | char b[1000]; |
| 18 | char b2[1000]; |
| 19 | char vx[1000]; |
| 20 | memset(b,0,sizeof(b)); |
| 21 | memset(b2,0,sizeof(b2)); |
| 22 | memset(vx,0,sizeof(vx)); |
| 23 | u = fopen(argv[1],"r"); |
| 24 | fgets(b, sizeof(b)-1,u); |
| 25 | fclose(u); |
| 26 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| @@ -55,22 +53,23 @@ | |
| 55 | } |
| 56 | z++; |
| 57 | } |
| 58 | for(z=vx; z[0]=='0'; z++){} |
| 59 | printf("#define RELEASE_VERSION_NUMBER %s\n", z); |
| 60 | strcpy(b2,b); |
| 61 | d = 0; |
| 62 | for(z=b2; z[0]; z++){ |
| 63 | if( z[0]!='.' ) continue; |
| 64 | if ( d<3 ){ |
| 65 | z[0] = ','; |
| 66 | d++; |
| 67 | }else{ |
| 68 | z[0] = '\0'; |
| 69 | break; |
| 70 | } |
| 71 | } |
| 72 | printf("#define RELEASE_RESOURCE_VERSION %s", b2); |
| 73 | while( d<3 ){ printf(",0"); d++; } |
| 74 | printf("\n"); |
| 75 | return 0; |
| 76 | } |
| 77 |
| --- src/mkversion.c | |
| +++ src/mkversion.c | |
| @@ -13,14 +13,12 @@ | |
| 13 | int main(int argc, char *argv[]){ |
| 14 | FILE *m,*u,*v; |
| 15 | char *z; |
| 16 | int i, x, d; |
| 17 | char b[1000]; |
| 18 | char vx[1000]; |
| 19 | memset(b,0,sizeof(b)); |
| 20 | memset(vx,0,sizeof(vx)); |
| 21 | u = fopen(argv[1],"r"); |
| 22 | fgets(b, sizeof(b)-1,u); |
| 23 | fclose(u); |
| 24 | for(z=b; z[0] && z[0]!='\r' && z[0]!='\n'; z++){} |
| @@ -55,22 +53,23 @@ | |
| 53 | } |
| 54 | z++; |
| 55 | } |
| 56 | for(z=vx; z[0]=='0'; z++){} |
| 57 | printf("#define RELEASE_VERSION_NUMBER %s\n", z); |
| 58 | memset(vx,0,sizeof(vx)); |
| 59 | strcpy(vx,b); |
| 60 | d = 0; |
| 61 | for(z=vx; z[0]; z++){ |
| 62 | if( z[0]!='.' ) continue; |
| 63 | if ( d<3 ){ |
| 64 | z[0] = ','; |
| 65 | d++; |
| 66 | }else{ |
| 67 | z[0] = '\0'; |
| 68 | break; |
| 69 | } |
| 70 | } |
| 71 | printf("#define RELEASE_RESOURCE_VERSION %s", vx); |
| 72 | while( d<3 ){ printf(",0"); d++; } |
| 73 | printf("\n"); |
| 74 | return 0; |
| 75 | } |
| 76 |