ncurses 5.9 - patch 20141220

[ncurses.git] / form / fld_dup.c

diff --git a/form/fld_dup.c b/form/fld_dup.c
index d16e4009492e977432d0bd00aeb995cf6e697be0..2df40ee0590e6213ffa67d39b63b74e7507f27ac 100644 (file)
--- a/form/fld_dup.c
+++ b/form/fld_dup.c
@@ -1,5 +1,5 @@
 /****************************************************************************
 /****************************************************************************

- * Copyright (c) 1998-2002,2003 Free Software Foundation, Inc.              *
+ * Copyright (c) 1998-2010,2012 Free Software Foundation, Inc.              *

  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *


@@ -32,67 +32,70 @@
 
 #include "form.priv.h"
 
 
 #include "form.priv.h"
 

-MODULE_ID("$Id: fld_dup.c,v 1.7 2003/10/25 15:17:08 tom Exp $")
+MODULE_ID("$Id: fld_dup.c,v 1.14 2012/03/11 00:37:16 tom Exp $")

 
 /*---------------------------------------------------------------------------
 
 /*---------------------------------------------------------------------------

-|   Facility      :  libnform  
+|   Facility      :  libnform

 |   Function      :  FIELD *dup_field(FIELD *field, int frow, int fcol)
 |   Function      :  FIELD *dup_field(FIELD *field, int frow, int fcol)

-|   
+|

 |   Description   :  Duplicates the field at the specified position. All
 |                    field attributes and the buffers are copied.
 |                    If an error occurs, errno is set to
 |   Description   :  Duplicates the field at the specified position. All
 |                    field attributes and the buffers are copied.
 |                    If an error occurs, errno is set to

-|                    
+|

 |                    E_BAD_ARGUMENT - invalid argument
 |                    E_SYSTEM_ERROR - system error
 |
 |   Return Values :  Pointer to the new field or NULL if failure
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(FIELD *)
 |                    E_BAD_ARGUMENT - invalid argument
 |                    E_SYSTEM_ERROR - system error
 |
 |   Return Values :  Pointer to the new field or NULL if failure
 +--------------------------------------------------------------------------*/
 NCURSES_EXPORT(FIELD *)

-dup_field (FIELD * field, int frow, int fcol)
+dup_field(FIELD *field, int frow, int fcol)

 {
   FIELD *New_Field = (FIELD *)0;
   int err = E_BAD_ARGUMENT;
 
 {
   FIELD *New_Field = (FIELD *)0;
   int err = E_BAD_ARGUMENT;
 

-  if (field && (frow>=0) && (fcol>=0) && 
-      ((err=E_SYSTEM_ERROR) != 0) && /* trick : this resets the default error */
-      (New_Field=(FIELD *)malloc(sizeof(FIELD))) )
+  T((T_CALLED("dup_field(%p,%d,%d)"), (void *)field, frow, fcol));
+  if (field && (frow >= 0) && (fcol >= 0) &&
+      ((err = E_SYSTEM_ERROR) != 0) && /* trick : this resets the default error */
+      (New_Field = typeMalloc(FIELD, 1)))

     {
     {

-      *New_Field         = *_nc_Default_Field;
-      New_Field->frow    = frow;
-      New_Field->fcol    = fcol;
-      New_Field->link    = New_Field;
-      New_Field->rows    = field->rows;
-      New_Field->cols    = field->cols;
-      New_Field->nrow    = field->nrow;
-      New_Field->drows   = field->drows;
-      New_Field->dcols   = field->dcols;
+      T((T_CREATE("field %p"), (void *)New_Field));
+      *New_Field = *_nc_Default_Field;
+      New_Field->frow = (short) frow;
+      New_Field->fcol = (short) fcol;
+      New_Field->link = New_Field;
+      New_Field->rows = field->rows;
+      New_Field->cols = field->cols;
+      New_Field->nrow = field->nrow;
+      New_Field->drows = field->drows;
+      New_Field->dcols = field->dcols;

       New_Field->maxgrow = field->maxgrow;
       New_Field->maxgrow = field->maxgrow;

-      New_Field->nbuf    = field->nbuf;
-      New_Field->just    = field->just;
-      New_Field->fore    = field->fore;
-      New_Field->back    = field->back;
-      New_Field->pad     = field->pad;
-      New_Field->opts    = field->opts;
-      New_Field->usrptr  = field->usrptr;
+      New_Field->nbuf = field->nbuf;
+      New_Field->just = field->just;
+      New_Field->fore = field->fore;
+      New_Field->back = field->back;
+      New_Field->pad = field->pad;
+      New_Field->opts = field->opts;
+      New_Field->usrptr = field->usrptr;

 
 

-      if (_nc_Copy_Type(New_Field,field))
+      if (_nc_Copy_Type(New_Field, field))

        {
        {

-         size_t len;
+         size_t i, len;

 
          len = Total_Buffer_Size(New_Field);
 
          len = Total_Buffer_Size(New_Field);

-         if ( (New_Field->buf=(char *)malloc(len)) )
+         if ((New_Field->buf = (FIELD_CELL *)malloc(len)))

            {
            {

-             memcpy(New_Field->buf,field->buf,len);
-             return New_Field;
+             for (i = 0; i < len; ++i)
+               New_Field->buf[i] = field->buf[i];
+             returnField(New_Field);

            }
        }
     }
 
            }
        }
     }
 

-  if (New_Field) 
+  if (New_Field)

     free_field(New_Field);
 
   SET_ERROR(err);
     free_field(New_Field);
 
   SET_ERROR(err);

-  return (FIELD *)0;
+  returnField((FIELD *)0);

 }
 
 /* fld_dup.c ends here */
 }
 
 /* fld_dup.c ends here */