Fossil SCM
Change strcpy() to memcpy() inside diff.c to avoid compiler warnings on OpenBSD.
Commit
06e9863cb093ee72990aff0fe2909ff1463be0ad
Parent
2f4a101ca511606…
1 file changed
+1
-1
+1
-1
| --- src/diff.c | ||
| +++ src/diff.c | ||
| @@ -588,11 +588,11 @@ | ||
| 588 | 588 | static char *copylimline(char *out, DLine *dl, int lim){ |
| 589 | 589 | int len; |
| 590 | 590 | len = dl->h & LENGTH_MASK; |
| 591 | 591 | if( lim && len > lim ){ |
| 592 | 592 | memcpy(out, dl->z, lim-3); |
| 593 | - strcpy(&out[lim-3], "..."); | |
| 593 | + memcpy(&out[lim-3], "...", 4); | |
| 594 | 594 | }else{ |
| 595 | 595 | memcpy(out, dl->z, len); |
| 596 | 596 | out[len] = '\0'; |
| 597 | 597 | } |
| 598 | 598 | return out; |
| 599 | 599 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -588,11 +588,11 @@ | |
| 588 | static char *copylimline(char *out, DLine *dl, int lim){ |
| 589 | int len; |
| 590 | len = dl->h & LENGTH_MASK; |
| 591 | if( lim && len > lim ){ |
| 592 | memcpy(out, dl->z, lim-3); |
| 593 | strcpy(&out[lim-3], "..."); |
| 594 | }else{ |
| 595 | memcpy(out, dl->z, len); |
| 596 | out[len] = '\0'; |
| 597 | } |
| 598 | return out; |
| 599 |
| --- src/diff.c | |
| +++ src/diff.c | |
| @@ -588,11 +588,11 @@ | |
| 588 | static char *copylimline(char *out, DLine *dl, int lim){ |
| 589 | int len; |
| 590 | len = dl->h & LENGTH_MASK; |
| 591 | if( lim && len > lim ){ |
| 592 | memcpy(out, dl->z, lim-3); |
| 593 | memcpy(&out[lim-3], "...", 4); |
| 594 | }else{ |
| 595 | memcpy(out, dl->z, len); |
| 596 | out[len] = '\0'; |
| 597 | } |
| 598 | return out; |
| 599 |