add set to curFileNotDefCmds and correct offsets for p4Client and p4User extraction