use more efficient string copying

[elogind.git] / extras / scsi_id / scsi_id.c

diff --git a/extras/scsi_id/scsi_id.c b/extras/scsi_id/scsi_id.c
index d630cf902b16de4531aab7fefbb6a14d03458ba5..213a267afadf30263289c601b8436aa56c9dca71 100644 (file)
--- a/extras/scsi_id/scsi_id.c
+++ b/extras/scsi_id/scsi_id.c
@@ -105,7 +105,7 @@ static void set_type(const char *from, char *to, size_t len)
                        break;
                }
        }
-       util_strlcpy(to, type, len);
+       util_strscpy(to, len, type);
 }
 
 /*
@@ -354,7 +354,7 @@ static int set_options(struct udev *udev,
 
                case 'd':
                        dev_specified = 1;
-                       util_strlcpy(maj_min_dev, optarg, MAX_PATH_LEN);
+                       util_strscpy(maj_min_dev, MAX_PATH_LEN, optarg);
                        break;
 
                case 'e':
@@ -362,7 +362,7 @@ static int set_options(struct udev *udev,
                        break;
 
                case 'f':
-                       util_strlcpy(config_file, optarg, MAX_PATH_LEN);
+                       util_strscpy(config_file, MAX_PATH_LEN, optarg);
                        break;
 
                case 'g':
@@ -428,7 +428,7 @@ static int set_options(struct udev *udev,
        }
        if (optind < argc && !dev_specified) {
                dev_specified = 1;
-               util_strlcpy(maj_min_dev, argv[optind], MAX_PATH_LEN);
+               util_strscpy(maj_min_dev, MAX_PATH_LEN, argv[optind]);
        }
        return 0;
 }