X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/0c4b77992e89ec742c9a938395ddaf979b2747e0..b1234a5c0fbf2d2ec410eeb253b44498f499daa3:/mac/macterm.c

diff --git a/mac/macterm.c b/mac/macterm.c
index f1ec6177..b07756c7 100644
--- a/mac/macterm.c
+++ b/mac/macterm.c
@@ -1,4 +1,4 @@
-/* $Id: macterm.c,v 1.36 2003/01/08 22:46:12 ben Exp $ */
+/* $Id: macterm.c,v 1.39 2003/01/09 23:29:22 ben Exp $ */
 /*
  * Copyright (c) 1999 Simon Tatham
  * Copyright (c) 1999, 2002 Ben Harris
@@ -238,7 +238,7 @@ static void mac_initfont(Session *s) {
     OptionBits fbflags;
 
     SetPort(s->window);
-    macfont[0] = sprintf((char *)&macfont[1], "%s", s->cfg.font);
+    c2pstrcpy(macfont, s->cfg.font);
     GetFNum(macfont, &s->fontnum);
     TextFont(s->fontnum);
     TextFace(s->cfg.fontisbold ? bold : 0);
@@ -885,6 +885,7 @@ static pascal void mac_growtermdraghook(void)
     GrafPtr portsave;
     Point mouse;
     char buf[20];
+    unsigned char pbuf[20];
     int newrows, newcols;
     
     GetMouse(&mouse);
@@ -896,13 +897,13 @@ static pascal void mac_growtermdraghook(void)
     if (strcmp(buf, growterm_state.oldmsg) == 0)
 	return;
     strcpy(growterm_state.oldmsg, buf);
-    c2pstr(buf);
+    c2pstrcpy(pbuf, buf);
 
     GetPort(&portsave);
     SetPort(growterm_state.s->window);
     EraseRect(&growterm_state.msgrect);
     MoveTo(growterm_state.msgorigin.h, growterm_state.msgorigin.v);
-    DrawString((StringPtr)buf);
+    DrawString(pbuf);
     SetPort(portsave);
 }
 
@@ -1268,7 +1269,7 @@ void set_title(void *frontend, char *title) {
     Session *s = frontend;
     Str255 mactitle;
 
-    mactitle[0] = sprintf((char *)&mactitle[1], "%s", title);
+    c2pstrcpy(mactitle, title);
     SetWTitle(s->window, mactitle);
 }
 
@@ -1401,9 +1402,12 @@ void get_window_pixels(void *frontend, int *x, int *y)
 char *get_window_title(void *frontend, int icon)
 {
     Session *s = frontend;
+    Str255 ptitle;
+    static char title[256];
 
-    /* Erm, we don't save this at the moment */
-    return "";
+    GetWTitle(s->window, ptitle);
+    p2cstrcpy(title, ptitle);
+    return title;
 }
 
 /*