X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=lustre%2Ftests%2Fopenfile.c;h=c98313e1a0f36ef4dac06b98cf99c1942ab61fe7;hb=707bab62f5d6c704b30e4ee9e769b5c9f026e1e7;hp=da10c49c126284477d482360c81cf29fcc36652d;hpb=e3a7c58aebafce40323db54bf6056029e5af4a70;p=fs%2Flustre-release.git

diff --git a/lustre/tests/openfile.c b/lustre/tests/openfile.c
index da10c49..c98313e 100644
--- a/lustre/tests/openfile.c
+++ b/lustre/tests/openfile.c
@@ -15,11 +15,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * version 2 along with this program; If not, see
- * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
- *
- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
- * CA 95054 USA or visit www.sun.com if you need additional information or
- * have any questions.
+ * http://www.gnu.org/licenses/gpl-2.0.html
  *
  * GPL HEADER END
  */
@@ -49,8 +45,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <unistd.h>
-#include <libcfs/libcfs.h>
-#include <lustre/lustre_user.h>
+#include <linux/lustre/lustre_user.h>
 
 typedef struct flag_mapping {
        const char *string;
@@ -105,16 +100,15 @@ int main(int argc, char** argv)
         while ((c = getopt (argc, argv, "f:m:")) != -1) {
                 switch (c) {
                 case 'f': {
-                        char *tmp;
+			char *tmp;
 
-                        cloned_flags = (char *)malloc(strlen(optarg)+1);
-                        if (cloned_flags == NULL) {
-                                fprintf(stderr, "Insufficient memory.\n");
-                                save_errno = -1;
-                                goto out;
-                        }
+			cloned_flags = strdup(optarg);
+			if (cloned_flags == NULL) {
+				fprintf(stderr, "Insufficient memory.\n");
+				save_errno = -1;
+				goto out;
+			}
 
-                        strncpy(cloned_flags, optarg, strlen(optarg)+1);
                         flags = atoi(cloned_flags);
                         if (flags > 0) {
                                 flag_set = 1;