Merge remote-tracking branch 'remotes/kevin/tags/for-upstream' into staging

[qemu.git] / slirp / misc.c

diff --git a/slirp/misc.c b/slirp/misc.c
index b8eb74cab03d86ded061e42daee30cf0405c9cf7..6543dc777298463931ae82fbb94619c8b0ee5902 100644 (file)
--- a/slirp/misc.c
+++ b/slirp/misc.c
@@ -54,11 +54,11 @@ int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec,
        }
 
        tmp_ptr = *ex_ptr;
        }
 
        tmp_ptr = *ex_ptr;

-       *ex_ptr = (struct ex_list *)malloc(sizeof(struct ex_list));
+       *ex_ptr = g_new(struct ex_list, 1);

        (*ex_ptr)->ex_fport = port;
        (*ex_ptr)->ex_addr = addr;
        (*ex_ptr)->ex_pty = do_pty;
        (*ex_ptr)->ex_fport = port;
        (*ex_ptr)->ex_addr = addr;
        (*ex_ptr)->ex_pty = do_pty;

-       (*ex_ptr)->ex_exec = (do_pty == 3) ? exec : strdup(exec);
+       (*ex_ptr)->ex_exec = (do_pty == 3) ? exec : g_strdup(exec);

        (*ex_ptr)->ex_next = tmp_ptr;
        return 0;
 }
        (*ex_ptr)->ex_next = tmp_ptr;
        return 0;
 }


@@ -187,7 +187,7 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
                           bptr++;
                        c = *bptr;
                        *bptr++ = (char)0;
                           bptr++;
                        c = *bptr;
                        *bptr++ = (char)0;

-                       argv[i++] = strdup(curarg);
+                       argv[i++] = g_strdup(curarg);

                   } while (c);
 
                 argv[i] = NULL;
                   } while (c);
 
                 argv[i] = NULL;


@@ -228,20 +228,6 @@ fork_exec(struct socket *so, const char *ex, int do_pty)
 }
 #endif
 
 }
 #endif
 

-#ifndef HAVE_STRDUP
-char *
-strdup(str)
-       const char *str;
-{
-       char *bptr;
-
-       bptr = (char *)malloc(strlen(str)+1);
-       strcpy(bptr, str);
-
-       return bptr;
-}
-#endif
-

 void slirp_connection_info(Slirp *slirp, Monitor *mon)
 {
     const char * const tcpstates[] = {
 void slirp_connection_info(Slirp *slirp, Monitor *mon)
 {
     const char * const tcpstates[] = {