Author: ankry Date: Sat Oct 21 09:54:33 2006 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 1.8
---- Files affected: SOURCES: perl-User-Utmp-strcmp-fix.patch (1.1 -> 1.2) ---- Diffs: ================================================================ Index: SOURCES/perl-User-Utmp-strcmp-fix.patch diff -u SOURCES/perl-User-Utmp-strcmp-fix.patch:1.1 SOURCES/perl-User-Utmp-strcmp-fix.patch:1.2 --- SOURCES/perl-User-Utmp-strcmp-fix.patch:1.1 Thu Jul 11 11:27:23 2002 +++ SOURCES/perl-User-Utmp-strcmp-fix.patch Sat Oct 21 11:54:28 2006 @@ -9,7 +9,7 @@ hv_iterinit(entry); -@@ -240,21 +240,21 @@ +@@ -282,14 +282,14 @@ { char* c_val; @@ -17,34 +17,36 @@ + c_val = SvPV(val, st_len); strncpy(utent->ut_user, c_val, sizeof(utent->ut_user)); } - else if(strEQ(key, "ut_id")) + else if (strEQ(key, "ut_line")) { char* c_val; - c_val = SvPV(val, strlen); + c_val = SvPV(val, st_len); - strncpy(utent->ut_id, c_val, sizeof(utent->ut_id)); + strncpy(utent->ut_line, c_val, sizeof(utent->ut_line)); } - else if(strEQ(key, "ut_line")) + else if (strEQ(key, "ut_time")) +@@ -302,7 +302,7 @@ { char* c_val; - c_val = SvPV(val, strlen); + c_val = SvPV(val, st_len); - strncpy(utent->ut_line, c_val, sizeof(utent->ut_line)); + strncpy(utent->ut_id, c_val, sizeof(utent->ut_id)); } - else if(strEQ(key, "ut_pid")) -@@ -296,15 +296,15 @@ + else if (strEQ(key, "ut_pid")) +@@ -342,7 +342,7 @@ { - char* c_val; + char *c_val; - c_val = SvPV(val, strlen); + c_val = SvPV(val, st_len); strncpy(utent->ut_host, c_val, sizeof(utent->ut_host)); } #endif +@@ -350,8 +350,8 @@ #ifdef HAS_UT_ADDR - else if(strEQ(key, "ut_addr")) + else if (strEQ(key, "ut_addr")) { - memcpy(&utent->ut_addr, SvPV(val, strlen), - MIN(sizeof(utent->ut_addr), strlen)); @@ -53,3 +55,46 @@ } #endif } +@@ -364,7 +364,7 @@ + char *key; + SV *val; + I32 len; +- STRLEN strlen; ++ STRLEN st_len; + + /* Initialize the entry */ + +@@ -408,21 +408,21 @@ + { + char* c_val; + +- c_val = SvPV(val, strlen); ++ c_val = SvPV(val, st_len); + strncpy(utent->ut_name, c_val, sizeof(utent->ut_name)); + } + else if (strEQ(key, "ut_id")) + { + char* c_val; + +- c_val = SvPV(val, strlen); ++ c_val = SvPV(val, st_len); + strncpy(utent->ut_id, c_val, sizeof(utent->ut_id)); + } + else if (strEQ(key, "ut_line")) + { + char* c_val; + +- c_val = SvPV(val, strlen); ++ c_val = SvPV(val, st_len); + strncpy(utent->ut_line, c_val, sizeof(utent->ut_line)); + } + else if (strEQ(key, "ut_pid")) +@@ -518,7 +518,7 @@ + { + char* c_val; + +- c_val = SvPV(val, strlen); ++ c_val = SvPV(val, st_len); + strncpy(utent->ut_host, c_val, sizeof(utent->ut_host)); + } + #endif ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/perl-User-Utmp-strcmp-fix.patch?r1=1.1&r2=1.2&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit