patch-phoon_c 1.1 KB

12345678910111213141516171819202122232425262728293031323334
  1. $OpenBSD: patch-phoon_c,v 1.4 2007/12/18 09:43:37 ajacoutot Exp $
  2. --- phoon.c.orig Fri May 20 21:10:24 2005
  3. +++ phoon.c Tue Dec 18 09:38:15 2007
  4. @@ -354,7 +354,7 @@ putmoon( time_t t, int numlines, char* atfiller )
  5. struct tm* tmP;
  6. double jd, pctphase, angphase, cphase, aom, cdist, cangdia, csund, csuang;
  7. double phases[2], which[2];
  8. - long clocknow;
  9. + time_t clocknow;
  10. int atflrlen, atflridx, numcols, lin, col, midlin;
  11. double mcap, yrad, xrad, y, xright, xleft;
  12. int colright, colleft;
  13. @@ -538,15 +538,15 @@ main( int argc, char** argv )
  14. else if ( argc - argn == 1 || argc - argn == 2 || argc - argn == 3 )
  15. {
  16. /* One, two, or three args - use them. */
  17. - strcpy( buf, argv[argn] );
  18. + strlcpy( buf, argv[argn], sizeof(buf) );
  19. if ( argc - argn > 1 )
  20. {
  21. - strcat( buf, " " );
  22. - strcat( buf, argv[argn + 1] );
  23. + strlcat( buf, " ", sizeof(buf) );
  24. + strlcat( buf, argv[argn + 1], sizeof(buf) );
  25. if ( argc - argn > 2 )
  26. {
  27. - strcat( buf, " " );
  28. - strcat( buf, argv[argn + 2] );
  29. + strlcat( buf, " ", sizeof(buf) );
  30. + strlcat( buf, argv[argn + 2], sizeof(buf) );
  31. }
  32. }
  33. t = date_parse( buf );